diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2005-06-17 01:02:14 +0000 |
---|---|---|
committer | John Bowler <jbowler@nslu2-linux.org> | 2005-06-17 01:02:14 +0000 |
commit | 17eda4148261ba29cc23c949c0e2da2a70030336 (patch) | |
tree | a7907b13a3a4d06a404c405a90c9046736d0ed49 /packages/linux/openslug-kernel_2.6.11.2.bb | |
parent | d8815b187088d9e54e656811e5efdc560a0823b2 (diff) |
Fix for shutdown -h. Change shutdown -r to use soft reboot (which does
not currently work, but there seems to be no way to make the hardware
reboot work reliably). Also change the soft reboot to set the watchdog
timer so that if it *doesn't* work the hardware reboot gets used (it does
sometimes work...)
BKrev: 42b22116rJbKTRTvvr2KxZ0fK909pA
Diffstat (limited to 'packages/linux/openslug-kernel_2.6.11.2.bb')
-rw-r--r-- | packages/linux/openslug-kernel_2.6.11.2.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb index b604e27ad8..476bea31b8 100644 --- a/packages/linux/openslug-kernel_2.6.11.2.bb +++ b/packages/linux/openslug-kernel_2.6.11.2.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r11" +PR = "r12" KERNEL_SUFFIX = "openslug" @@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.2.tar.bz2 \ file://usbnet.patch;patch=1 \ file://ixp4xx_copy_from.patch;patch=1 \ file://anonymiser.patch;patch=1 \ + file://xscale-reset.patch;patch=1 \ file://defconfig \ file://x1205-rtc.c \ file://nslu2-io.c \ @@ -27,7 +28,7 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" CMDLINE_CONSOLE ?= "ttyS0,115200n8" -CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc" +CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s" #CMDLINE_ROOT ?= "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000" CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" |