From 58a7a3255dcb36fa88523c155a33221003a340d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 Jan 2016 18:23:42 +0100 Subject: 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 ebc3d64..7d773a8 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 \ -- cgit v0.10.2 From 1011226d733f3e0e78485e93681f71e9f66c836e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 Jan 2016 18:23:43 +0100 Subject: ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts= Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) prepended mtdparts= to the flash partition information in CONFIG_MTDPARTS, but it is used like "mtdparts=" CONFIG_MTDPARTS - So we end up passing mtdparts=mtdparts=.. to the kernel, confusing the cmdline partition parser. Fix it by dropping the double 'mtdparts='. Signed-off-by: Peter Korsgaard diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 7d773a8..8110f83 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -63,7 +63,7 @@ "${x_bootcmd_usb}; bootm 0x6400000;" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:512K(uboot)," \ + "orion_nand:512K(uboot)," \ "512K(env),1M(script),6M(kernel)," \ "12M(ramdisk),4M(spare),-(rootfs)\0" -- cgit v0.10.2 From a807369eded75b34f5184552dab00ff73e7ca3bc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 Jan 2016 18:23:44 +0100 Subject: ARM: sheevaplug: drop unneded 'usb start' from boot command The default bootcommand executes x_bootcmd_usb AFTER loading a kernel from nand and just before executing it, which only slows down boot without adding any functionality - So drop it. Signed-off-by: Peter Korsgaard diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 8110f83..c529636 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -60,7 +60,7 @@ */ #define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ - "${x_bootcmd_usb}; bootm 0x6400000;" + "bootm 0x6400000;" #define CONFIG_MTDPARTS \ "orion_nand:512K(uboot)," \ -- cgit v0.10.2