This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 5 ++++-
default_config/defaults.cfg | 32 +++++++++++++++++++-------------
image-creator | 6 +++++-
3 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 3b509978ce3122df6b7ae97fa44619522eef251c
Author: Prajwal Mohan <[EMAIL PROTECTED]>
Date: Sun Aug 17 10:42:33 2008 -0700
Adding nand to command line
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index a464aab..478d2bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,7 +101,10 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
* Added some localization and cleaned to dirty codes.
* Added some localization.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 14 Aug 2008 00:53:19 +0900
+ [ Prajwal Mohan ]
+ * Adding nand to command line
+
+ -- Prajwal Mohan <[EMAIL PROTECTED]> Sun, 17 Aug 2008 10:42:09 -0700
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/default_config/defaults.cfg b/default_config/defaults.cfg
index 1d792b5..59a1ba4 100644
--- a/default_config/defaults.cfg
+++ b/default_config/defaults.cfg
@@ -17,6 +17,9 @@ debug = 0
# Be verbose when saving and loading projects, 0 is no, 1 is yes
verbose_project_tar = 0
+# Use rootstraps, 1 = use rootstraps, 0 = do NOT use rootstraps.
+use_rootstraps = 1
+
# ********* Platform section **********
# If you want to have configuration date for a specific platform, then you can
# specify a section name in the form of [platform.platform_name]. Otherwise
@@ -44,7 +47,7 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools g
buildroot_packages = initramfs-tools debhelper devscripts liburi-perl
kernel-package dpatch grub libncursesw5-dev libncurses5-dev man less vim
apt-utils libgtk2.0-dev ssh automake autotools-dev build-essential
gtk-doc-tools dh-make hildon-desktop libhildon-1-dev libhildonfm2-dev
hildon-desktop-dev
# Options for the kernel that will be booted from the hard drive on the device
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet
# Options for the kernel that will be booted from the USB flash drive
usb_kernel_cmdline = initrd=initrd.img boot=usb
@@ -53,7 +56,7 @@ usb_kernel_cmdline = initrd=initrd.img boot=usb
cd_kernel_cmdline = initrd=initrd.img boot=cd
# Options for the kernel that will be booted from NAND
-nand_kernel_cmdline = ro boot=nand legfree_x86=true single console=ttyS0
earlyprintk=mrst
+nand_kernel_cmdline = ro no-hlt boot=nand single console=ttyMS0
earlyprintk=serial apic=debug idle=poll loglevel=8
# Architecture to use for creating the rootstraps
architecture=lpia
@@ -63,25 +66,25 @@ architecture=lpia
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
[platform.mccaslin-lpia-ubuntu-gutsy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia-ubuntu-hardy]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia-ubuntu-hardy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
[platform.mccaslin-lpia-ubuntu-hardy-ppa-snapshot]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
# Going to use the snapshot for the PPA platform
@@ -89,24 +92,24 @@ buildroot_mirror =
http://snapshot.ubuntu.com/lpia/snapshot/2008-02-27/ports/
# ********** Special stuff unique to Menlow **********
[platform.menlow-lpia]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
[platform.menlow-lpia-ubuntu-gutsy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
[platform.menlow-lpia-ubuntu-hardy]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
buildroot_codename = hardy
[platform.menlow-lpia-ubuntu-hardy-ppa]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
buildroot_codename = hardy
[platform.menlow-lpia-ubuntu-hardy-ppa-snapshot]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
buildroot_codename = hardy
# Going to use the snapshot for the PPA platform
buildroot_mirror = http://snapshot.ubuntu.com/lpia/snapshot/2008-02-27/ports/
@@ -124,6 +127,9 @@ buildroot_packages = grub man less vim automake
autotools-dev openssh-clients
[installimage]
welcome_message = Welcome to Moblin:
+# How big, in megabytes, to make the nand flash image
+nand_image_size = 512
+
# How big, in megabytes, to make the ext3 File System on the Live Read/Write
# USB image
ext3fs_size = 100
@@ -145,7 +151,7 @@ swap_partition_size = 1024
fat32_partition_size = 0
# Use squashfs, 1 = use squashfs, 0 = do NOT use squashfs on the target disk.
-use_squashfs = 1
+use_squashfs = 0
# ********** Special stuff unique to Menlow **********
# Only Menlow has USBC and need fat32 partition for media sync usage
diff --git a/image-creator b/image-creator
index cbbf7d5..eb13d34 100755
--- a/image-creator
+++ b/image-creator
@@ -132,7 +132,7 @@ def main():
update_project(options)
elif options.cmd == "update-target":
update_target(options)
- elif options.cmd in ["create-live-usb", "create-live-usbrw",
"create-install-usb", "create-live-iso"]:
+ elif options.cmd in ["create-live-usb", "create-live-usbrw",
"create-install-usb", "create-live-iso", "create-nand"]:
create_image(options)
elif options.cmd == "chroot-project":
chroot_project(options)
@@ -158,6 +158,7 @@ def parseCommandLine():
"create-live-usb" : 1,
"create-live-usbrw" : 1,
"create-live-iso" : 1,
+ "create-nand" : 1,
"create-project" : 1,
"create-target" : 1,
"delete-project" : 1,
@@ -294,6 +295,7 @@ Examples:
|create-live-usbrw \\
|create-install-usb] \\
|create-live-iso \\
+ |create-nand \\
--project-name='Myproject' \\
--target-name='MyTraget' \\
--image-name='MyImage'
@@ -603,6 +605,8 @@ def create_image(options):
proj.create_install_usb(options.target_name, options.image_name)
elif options.cmd == "create-live-iso":
proj.create_live_iso(options.target_name, options.image_name)
+ elif options.cmd == "create-nand":
+ proj.create_NAND_image(options.target_name, options.image_name)
def chroot_project(options):
proj = sdk.projects[options.project_name]
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
