commit cc69fa498c0a60e2eb5c47622d5af140a91a8ad1
author Allan Zhang <allanzhang@google.com> Tue Mar 24 21:45:55 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 24 21:45:56 2015 +0000
tree bf033ef0f2b81f50f30f8d432f5c318b820777cf
parent 94ec2ecc6f6e80c181d06dda456f6317fabce473
parent 6496a7b28fcb2da5794a7e286f8d6efc13510b8c

Merge "Change user configurable booting init"

include/configs/board953x.h

diff --git a/include/configs/board953x.h b/include/configs/board953x.h
index da39e4d..fd9f969 100755
--- a/include/configs/board953x.h
+++ b/include/configs/board953x.h
@@ -269,7 +269,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"dir=\0" "ACTIVATED_KERNEL_NAME=kernel0\0" ATH_U_CMD ATH_F_CMD ATH_K_CMD ""
 
-#define	CONFIG_BOOTARGS		"console=ttyS0,115200 root=" ATH_ROOT_DEV " rootfstype=squashfs init=/sbin/init " MTDPARTS_DEFAULT
+#define	CONFIG_BOOTARGS		"console=ttyS0,115200 root=" ATH_ROOT_DEV " rootfstype=squashfs init=/init " MTDPARTS_DEFAULT
 
 //#define CFG_PLL_FREQ    CFG_PLL_720_600_200
 
@@ -296,7 +296,7 @@
 #			define __WC_BOOTARGS_CONSOLE "console=ttyS0,115200"
 #			define __WC_BOOTARGS_PART_DEFS \
 					"rootfstype=squashfs \
-init=/sbin/init \
+init=/init \
 \
 mtdparts=ath-nor0:\
 320k(loader),\