aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc44x
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-14 10:20:53 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-14 10:20:53 +0000
commita9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b (patch)
treeda0c6a06eb4d50def39e6a0fb3bdd3ac813b74fe /target/linux/ppc44x
parentb0d4d23bc644dde146070ce692872884dc28a799 (diff)
downloadupstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.tar.gz
upstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.tar.bz2
upstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.zip
make kernels use /etc/preinit by default
SVN-Revision: 15840
Diffstat (limited to 'target/linux/ppc44x')
-rw-r--r--target/linux/ppc44x/config-default2
-rw-r--r--target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index e313119e4c..da0a1741e7 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -19,7 +19,7 @@ CONFIG_BOOKE=y
# CONFIG_BOOKE_WDT is not set
CONFIG_BOOT_LOAD=0x01000000
# CONFIG_BT is not set
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd"
CONFIG_CMDLINE_BOOL=y
CONFIG_CONSISTENT_SIZE=0x00200000
CONFIG_CONSISTENT_START=0xff100000
diff --git a/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch b/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
index 3c1a7570a6..e61943014c 100644
--- a/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
+++ b/target/linux/ppc44x/patches/100-openwrt_dts_cmdline.patch
@@ -4,6 +4,6 @@
chosen {
linux,stdout-path = "/plb/opb/serial@40000300";
-+ bootargs = "console=ttyS1,115200 root=/dev/mtdblock1 rootfstype=squashfs noinitrd init=/etc/preinit";
++ bootargs = "console=ttyS1,115200 root=/dev/mtdblock1 rootfstype=squashfs noinitrd";
};
};