Merge tag 'wht-0.47' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

6 files changed, 8 insertions, 60 deletions

diff --git a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
deleted file mode 100644
index e010f26c1..000000000
--- a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001
-From: Brad Bishop <bradleyb@fuzziesquirrel.com>
-Date: Thu, 5 Sep 2019 20:39:57 -0400
-Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment
- back at 512KiB
-
-Prior to 473f430b90 the environment was at 512KiB, and compatible with
-OpenBMC.  Restore OpenBMC compatibility by moving the environment back
-to 512KiB.
-
-Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
----
- include/configs/aspeed-common.h | 4 +++-
- include/configs/evb_ast2600.h   | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
-index 7a730d17ad..d1eb4688e6 100644
---- a/include/configs/aspeed-common.h
-+++ b/include/configs/aspeed-common.h
-@@ -52,7 +52,9 @@
- /*
-  * Miscellaneous configurable options
-  */
--#define CONFIG_BOOTCOMMAND		"bootm 200a0000"
-+#ifndef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND		"bootm 20080000"
-+#endif
- #define CONFIG_ENV_OVERWRITE
- 
- #define CONFIG_SYS_BOOTM_LEN 		(0x800000 * 2)
-diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
-index b4de42a05a..3a12f2f0d4 100644
---- a/include/configs/evb_ast2600.h
-+++ b/include/configs/evb_ast2600.h
-@@ -18,7 +18,7 @@
- 
- /* Environment */
- #define CONFIG_ENV_SIZE			0x10000
--#define CONFIG_ENV_OFFSET		0x90000
-+#define CONFIG_ENV_OFFSET		0x60000
- #define CONFIG_ENV_SECT_SIZE		(4 << 10)
- 
- #endif	/* __CONFIG_H */
--- 
-2.21.0
-
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config
new file mode 100644
index 000000000..ccd037ee6
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config
@@ -0,0 +1,2 @@
+# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
+/dev/mtd/u-boot-env	0x0000		0x10000		0x1000
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg
deleted file mode 100644
index 6862aaeb7..000000000
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="bootm 20100000"
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
index fe8533859..491068520 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
@@ -1,6 +1,6 @@
 require u-boot-common-aspeed-sdk_${PV}.inc
 
-UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX}"
+UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX} DEVICE_TREE=${UBOOT_DEVICETREE}"
 
 require recipes-bsp/u-boot/u-boot.inc
 
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
index 31dc5f2c8..46ab2e782 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
@@ -8,16 +8,9 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "4d29b04c7aca4121d542b759575fbb93e52aef47"
+SRCREV = "0991f0b8ae2eaad7d06977d2fabbb599f0d28a97"
 
-UBRANCH = "aspeed-dev-v2019.04"
-SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https"
-SRC_URI += "file://0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch"
-
-# There are different BOOTCOMMANDS for differently sized raw flash modules.
-ASPEED_IMAGE_SIZE_KB ?= "32768"
-MACHINEOVERRIDES .= ":flash-${ASPEED_IMAGE_SIZE_KB}"
-SRC_URI_append_flash-131072 = " file://bootcmd.cfg"
+SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
index 59fdbdeab..821457901 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb
@@ -5,6 +5,8 @@ DEPENDS += "mtd-utils"
 
 PROVIDES += "u-boot-fw-utils"
 
+SRC_URI += "file://fw_env_ast2600_nor.config"
+
 INSANE_SKIP_${PN} = "already-stripped"
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
 EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
@@ -21,7 +23,7 @@ do_install () {
 	install -d ${D}${sysconfdir}
 	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
 	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+	install -m 644 ${WORKDIR}/fw_env_ast2600_nor.config ${D}${sysconfdir}/fw_env.config
 }
 
 do_install_class-cross () {