diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-08-04 13:12:22 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-08-04 13:12:22 +0000 |
| commit | 7efe32a8489c41f1fedb5bcca5b4ffdbc4713359 (patch) | |
| tree | 077efcbed5c7e72bb0d6283e517baa28a402f7a4 /packages/kexecboot/linux-kexecboot-2.6.26 | |
| parent | 2f3a8dec220aeb3c9dcd2b661cda56bb9abdbf6d (diff) | |
kexecboot-initramfs: wait some seconds before startup
linux-kexecboot: remove debug output
kexecboot: pass rootdelay to all kernels
Diffstat (limited to 'packages/kexecboot/linux-kexecboot-2.6.26')
| -rw-r--r-- | packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie index 096050a3ae..7a22aa4ee1 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie +++ b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie @@ -251,7 +251,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" +CONFIG_CMDLINE="console=ttySA0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -398,7 +398,7 @@ CONFIG_BLK_DEV_IDE=y # Please see Documentation/ide/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_IDEDISK is not set +CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set |