diff options
Diffstat (limited to 'packages/kexecboot')
| -rw-r--r-- | packages/kexecboot/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/kexecboot/files/rootdelay.patch | 11 | ||||
| -rw-r--r-- | packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/packages/kexecboot/files/.mtn2git_empty b/packages/kexecboot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kexecboot/files/.mtn2git_empty diff --git a/packages/kexecboot/files/rootdelay.patch b/packages/kexecboot/files/rootdelay.patch new file mode 100644 index 0000000000..19a712ab57 --- /dev/null +++ b/packages/kexecboot/files/rootdelay.patch @@ -0,0 +1,11 @@ +--- kexecboot-0.3/kexecboot.c 2008-08-03 17:08:31.000000000 +0200 ++++ kexecboot/kexecboot.c 2008-08-04 13:35:32.167062391 +0200 +@@ -84,7 +84,7 @@ + char command[COMMAND_LINE_SIZE + 60]; + mount(boot->device, "/mnt", boot->fstype, MS_RDONLY, NULL); + if( boot->cmdline ) +- sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s\" -l %s", ++ sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s rootdelay=3\" -l %s", + boot->cmdline, boot->device, boot->fstype, boot->kernelpath); + else + sprintf(command,"kexec -l %s", boot->kernelpath); diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie index 7a22aa4ee1..a65552fbbb 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 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 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 |