diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
| commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
| tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /meta-aspeed/recipes-bsp | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
| download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'meta-aspeed/recipes-bsp')
3 files changed, 57 insertions, 3 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 new file mode 100644 index 000000000..e010f26c1 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch @@ -0,0 +1,47 @@ +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/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg new file mode 100644 index 000000000..6862aaeb7 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg @@ -0,0 +1,2 @@ +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="bootm 20100000" 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 7aa879cdf..31dc5f2c8 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,11 +8,16 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "d8ebf49e584e4e134bd8d1c445ef2da276a00e1a" +SRCREV = "4d29b04c7aca4121d542b759575fbb93e52aef47" -UBRANCH = "aspeed-master-v2019.04" +UBRANCH = "aspeed-dev-v2019.04" SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https" -SRC_URI += "file://0001-aspeed-Limit-bootm-memory.patch" +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" S = "${WORKDIR}/git" |