Fixed/reformatted uboot's bootcmd env var (WC)

Beforehand, if the env variable ACTIVATED_KERNEL_NAME was set to
kernel1, then bootargs would be set with "root=31:09" (boot from
partition 9), but if ACTIVATED_KERNEL_NAME was then set back to the
default "kernel0," bootargs would not be set to the previous value
wherein root is set to "31:04" (boot from partition 4).

This also fixes some typos.

Change-Id: I17a28d0cb7936d02efc312a6415f04607bfdd46e
diff --git a/include/configs/board953x.h b/include/configs/board953x.h
index 6b4e68d..d0fe913 100755
--- a/include/configs/board953x.h
+++ b/include/configs/board953x.h
@@ -263,13 +263,40 @@
 #		define CONFIG_BOOTCOMMAND	"bootm 0x9f300000"
 #	else
 #		if (FLASH_SIZE == 32)
+#			define __WC_BOOTARGS_CONSOLE "console=ttyS0,115200"
+#			define __WC_BOOTARGS_PART_DEFS \
+					"rootfstype=squashfs \
+init=/sbin/init \
+\
+mtdparts=ath-nor0:\
+320k(loader),\
+64k(env),\
+256k(sysvar1),\
+256k(sysvar2),\
+13888k(rootfs0),\
+1408k(kernel0),\
+64k(mib0),\
+64k(ART),\
+64k(test),\
+13888k(rootfs1),\
+1408k(kernel1),\
+1088k(config)"
+
 #			define CONFIG_BOOTCOMMAND	\
-"if test \"${ACTIVATED_KERNEL_NAME}\" = \"kernel1\"; then setenv bootargs \
-console=tyS0,115200  root=31:09 rootfstype=squashfs init=/sbin/init \
-mtdparts=ath-nor0:320k(loader),64k(env),256k(sysvar1),256k(sysvar2),\
-13888k(rootfs0),1408k(kernel0),64k(mib0),64k(ART),64k(test),13888k(rootfs1)\
-,1408k(kernel1),1088k(config) && read_ext 0x82060000 0x1d90000 0x160000 \
-&& bootm 0x82060000; else bootm 0x9fe70000; fi"
+\
+"if test \"${ACTIVATED_KERNEL_NAME}\" = \"kernel1\"; then \
+\
+setenv bootargs " __WC_BOOTARGS_CONSOLE " root=31:09 " __WC_BOOTARGS_PART_DEFS \
+       "&& read_ext 0x82060000 0x1d90000 0x160000 \
+       && bootm 0x82060000; \
+\
+else \
+\
+setenv bootargs " __WC_BOOTARGS_CONSOLE " root=31:04 " __WC_BOOTARGS_PART_DEFS \
+       "&& bootm 0x9fe70000; \
+\
+fi"
+
 #		elif (FLASH_SIZE == 16)
 #			define CONFIG_BOOTCOMMAND	"bootm 0x9fE80000"
 #		else