u-boot: Drop bootcmd support for legacy images

This u-boot bump contains one patch:

Brad Bishop (1):
      aspeed: Drop bootcmd support for legacy images

Rebase out of tree Witherspoon patches.

Change-Id: Ie8f4453a9d88823d7a97b9cd172089ead045024d
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

7 files changed, 62 insertions, 77 deletions

diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc
index 8e278bdff..054933057 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc
@@ -7,7 +7,7 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "7fb88a88d08c19b0e6f88c0a484ab001a4476a27"
+SRCREV = "e4c85cd4de96bfdff7b614731a044db11815ff0c"
 
 UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
deleted file mode 100644
index a5765e956..000000000
--- a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6bfd346da6639a83e17e271e95ce33d1d095334a Mon Sep 17 00:00:00 2001
-From: Patrick Williams <patrick@stwcx.xyz>
-Date: Fri, 21 Jul 2017 16:30:01 -0500
-Subject: [PATCH] config/ast-common: hack bootopts
-
-Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
----
- include/configs/ast-common.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index 0475109..8dfaff7 100644
---- a/include/configs/ast-common.h
-+++ b/include/configs/ast-common.h
-@@ -96,7 +96,10 @@
- #define CONFIG_CMD_MTDPARTS
- #endif
- 
-+#if 0
- #define CONFIG_BOOTARGS			"console=ttyS4,115200n8 root=/dev/ram rw"
-+#endif
-+#define CONFIG_BOOTARGS                         "console=ttyS4,115200n8 root=/dev/mtdblock4 ro"
- 
- #define CONFIG_AST_SPI_NOR    /* AST SPI NOR Flash */
- #define CONFIG_FMC_CS			1
-@@ -111,11 +114,14 @@
- #define CONFIG_ENV_SIZE			0x10000	/* Total Size of Environment Sector */
- #define CONFIG_ENV_SIZE_REDUND		0x10000
- 
-+#if 0
- #define CONFIG_BOOTCOMMAND	\
- 	"fdt addr 20080000; " \
- 	"if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
- 	"    bootm 20080000; else bootm 20080000 20300000; " \
- 	"fi"
-+#endif
-+#define CONFIG_BOOTCOMMAND                      "fdt addr 20080000; bootm 20080000"
- #define CONFIG_ENV_OVERWRITE
- 
- #define ASPEED_ENV_SETTINGS \
--- 
-1.8.2.2
-
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
index 35337a3ba..ee115e8e2 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
+++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-configs-ast-Add-redundnant-env.patch
@@ -1,7 +1,7 @@
-From ba7cf47befb92e2565bf6169ccc5b766647de222 Mon Sep 17 00:00:00 2001
+From 8ef2f4dcd208e072ab491874c06722c3a8ec69e3 Mon Sep 17 00:00:00 2001
 From: "Edward A. James" <eajames@us.ibm.com>
 Date: Thu, 13 Jul 2017 13:42:18 -0500
-Subject: [PATCH u-boot] configs/ast: Add redundnant env
+Subject: [PATCH 1/4] configs/ast: Add redundnant env
 
 Configure ast chips to run redundant u-boot environments.
 
@@ -11,10 +11,10 @@ Signed-off-by: Edward A. James <eajames@us.ibm.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index 110c780..15e1db4 100644
+index eff6d2b529..a0243083bd 100644
 --- a/include/configs/ast-common.h
 +++ b/include/configs/ast-common.h
-@@ -92,9 +92,12 @@
+@@ -104,9 +104,12 @@
  #define CONFIG_SYS_MAX_FLASH_SECT	(8192)		/* max number of sectors on one chip */
  #define CONFIG_ENV_IS_IN_FLASH		1
  #define CONFIG_ENV_ADDR			(AST_FMC_CS0_BASE + 0x60000)
@@ -26,8 +26,8 @@ index 110c780..15e1db4 100644
 +#define CONFIG_ENV_SIZE			0x10000	/* Total Size of Environment Sector */
 +#define CONFIG_ENV_SIZE_REDUND		0x10000
  
- #define CONFIG_BOOTCOMMAND	\
- 	"fdt addr 20080000; " \
+ #define CONFIG_BOOTCOMMAND		"bootm 20080000"
+ #define CONFIG_ENV_OVERWRITE
 -- 
-1.8.3.1
+2.14.3
 
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch
new file mode 100644
index 000000000..d04156712
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch
@@ -0,0 +1,28 @@
+From c678bbdad037604850613e775baacc52ed92c9c1 Mon Sep 17 00:00:00 2001
+From: Patrick Williams <patrick@stwcx.xyz>
+Date: Fri, 21 Jul 2017 16:30:01 -0500
+Subject: [PATCH 2/4] config/ast-common: hack bootopts
+
+Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
+---
+ include/configs/ast-common.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
+index a0243083bd..7ddba62298 100644
+--- a/include/configs/ast-common.h
++++ b/include/configs/ast-common.h
+@@ -96,7 +96,10 @@
+ #define CONFIG_CMD_MTDPARTS
+ #endif
+ 
++#if 0
+ #define CONFIG_BOOTARGS			"console=ttyS4,115200n8 root=/dev/ram rw"
++#endif
++#define CONFIG_BOOTARGS                         "console=ttyS4,115200n8 root=/dev/mtdblock4 ro"
+ 
+ #define CONFIG_AST_SPI_NOR    /* AST SPI NOR Flash */
+ #define CONFIG_FMC_CS			1
+-- 
+2.14.3
+
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch
index d026e9620..2c8dee019 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch
+++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch
@@ -1,7 +1,8 @@
-From d9e403ce8669d9b0ac4e94a7c64cef91ad51dc80 Mon Sep 17 00:00:00 2001
+From 0c77be343fc4781719dcc0748bc29a26ea83e0a3 Mon Sep 17 00:00:00 2001
 From: Adriana Kobylak <anoo@us.ibm.com>
 Date: Wed, 9 Aug 2017 14:11:56 -0500
-Subject: [PATCH] config/ast-common: Add bootopts to support ubi and mtd partitioning
+Subject: [PATCH 3/4] config/ast-common: Add bootopts to support ubi and mtd
+ partitioning
 
 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
 ---
@@ -9,22 +10,22 @@ Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index 8dfaff7..8150265 100644
+index 7ddba62298..14191e4ab0 100644
 --- a/include/configs/ast-common.h
 +++ b/include/configs/ast-common.h
-@@ -85,6 +85,12 @@
+@@ -84,6 +84,12 @@
+ #define CONFIG_SYS_MAXARGS		16
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
  
- /*
++/*
 + * Dynamic MTD Partition support
 + */
 +#define MTDIDS_DEFAULT		"nor0=bmc"
 +#define MTDPARTS_DEFAULT	"mtdparts=bmc:384k(u-boot),128k(u-boot-env),-(obmc-ubi)"
 +
-+/*
+ /*
   * Optional MTD and UBI support
   */
- #ifdef MTDPARTS_DEFAULT
 @@ -99,7 +105,7 @@
  #if 0
  #define CONFIG_BOOTARGS			"console=ttyS4,115200n8 root=/dev/ram rw"
@@ -34,7 +35,7 @@ index 8dfaff7..8150265 100644
  
  #define CONFIG_AST_SPI_NOR    /* AST SPI NOR Flash */
  #define CONFIG_FMC_CS			1
-@@ -108,6 +114,7 @@
+@@ -108,18 +114,27 @@
  #define CONFIG_ENV_IS_IN_FLASH		1
  #define CONFIG_ENV_ADDR			(AST_FMC_CS0_BASE + 0x60000)
  #define CONFIG_ENV_ADDR_REDUND		(AST_FMC_CS0_BASE + 0x70000)
@@ -42,11 +43,10 @@ index 8dfaff7..8150265 100644
  
  #define CONFIG_ENV_OFFSET		0x60000	/* environment starts here  */
  #define CONFIG_ENV_OFFSET_REDUND	0x70000
-@@ -121,12 +128,20 @@
- 	"    bootm 20080000; else bootm 20080000 20300000; " \
- 	"fi"
- #endif
--#define CONFIG_BOOTCOMMAND                      "fdt addr 20080000; bootm 20080000"
+ #define CONFIG_ENV_SIZE			0x10000	/* Total Size of Environment Sector */
+ #define CONFIG_ENV_SIZE_REDUND		0x10000
+ 
+-#define CONFIG_BOOTCOMMAND		"bootm 20080000"
 +#define CONFIG_BOOTCOMMAND		"run set_bootargs; run obmc_bootcmd"
  #define CONFIG_ENV_OVERWRITE
  
@@ -65,5 +65,5 @@ index 8dfaff7..8150265 100644
  
  #endif	/* __AST_COMMON_CONFIG_H */
 -- 
-1.8.2.2
+2.14.3
 
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-Add-conditional-factory-reset-comm.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch
index 7cef7aa2e..792cdb7c5 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-Add-conditional-factory-reset-comm.patch
+++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch
@@ -1,7 +1,7 @@
-From 90cdc1aa6079d0f2d5894807cbfee4e8125e2b5b Mon Sep 17 00:00:00 2001
+From 878651bbaa8a7da203fafccb164ca7b32287b8f9 Mon Sep 17 00:00:00 2001
 From: "Edward A. James" <eajames@us.ibm.com>
 Date: Thu, 9 Nov 2017 11:39:10 -0600
-Subject: [PATCH] config/ast-common: Add conditional factory reset command
+Subject: [PATCH 4/4] config/ast-common: Add conditional factory reset command
 
 Factory reset (removing persistant rwfs) has to occur before we've
 mounted the rwfs. However, the variable to determine whether or not to
@@ -14,7 +14,7 @@ Signed-off-by: Edward A. James <eajames@us.ibm.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index 8150265..41d196a 100644
+index 14191e4ab0..aaa5155e00 100644
 --- a/include/configs/ast-common.h
 +++ b/include/configs/ast-common.h
 @@ -121,6 +121,8 @@
@@ -23,10 +23,10 @@ index 8150265..41d196a 100644
  
 +#define CONFIG_RWFS_SIZE		0x400000
 +
- #if 0
- #define CONFIG_BOOTCOMMAND	\
- 	"fdt addr 20080000; " \
-@@ -137,11 +139,13 @@
+ #define CONFIG_BOOTCOMMAND		"run set_bootargs; run obmc_bootcmd"
+ #define CONFIG_ENV_OVERWRITE
+ 
+@@ -130,11 +132,13 @@
  	"kernelname=kernel-0 \0" \
  	"loadaddr=" __stringify(CONFIG_LOADADDR) "\0" \
  	"set_bootargs=setenv bootargs " CONFIG_BOOTARGS " ubi.block=\${ubiblock} root=\${root} \0" \
@@ -42,5 +42,5 @@ index 8150265..41d196a 100644
  
  #endif	/* __AST_COMMON_CONFIG_H */
 -- 
-1.8.3.1
+2.14.3
 
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
index 705213e27..983c33f54 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
@@ -3,9 +3,9 @@ inherit image_version
 SRC_URI_append_aspeed = " file://0001-configs-ast-Add-redundnant-env.patch"
 
 SRC_URI_append_aspeed = " ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
-    'file://0001-config-ast-common-hack-bootopts.patch \
-     file://0004-config-ast-common-ubi-bootops.patch \
-     file://0001-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
+    'file://0002-config-ast-common-hack-bootopts.patch \
+     file://0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch \
+     file://0004-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
 
 
 python do_configure_aspeed () {
@@ -17,7 +17,7 @@ python do_configure_aspeed () {
 
 patch_uboot () {
 	sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
-	${S}/patches/0004-config-ast-common-ubi-bootops.patch &> /dev/null
+	${S}/patches/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch &> /dev/null
 	sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
 	${S}/include/configs/ast-common.h &> /dev/null
 }