From: Peter Korsgaard Date: Sun, 17 Jan 2016 17:23:42 +0000 (+0100) Subject: ARM: sheevaplug: unbreak default environment X-Git-Tag: v2016.05-rc1~421^2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=58a7a3255dcb36fa88523c155a33221003a340d8;p=u-boot ARM: sheevaplug: unbreak default environment Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the mtdparts part of the default environment, but dropped the trailing zero termination - So the definition of x_bootcmd_kernel becomes part of the x_bootargs variable. Fix it by reintroducing the zero termination. Signed-off-by: Peter Korsgaard --- diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index ebc3d642f1..7d773a818a 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -65,7 +65,7 @@ #define CONFIG_MTDPARTS \ "mtdparts=orion_nand:512K(uboot)," \ "512K(env),1M(script),6M(kernel)," \ - "12M(ramdisk),4M(spare),-(rootfs)" + "12M(ramdisk),4M(spare),-(rootfs)\0" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \