diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-10 16:08:47 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-11 20:57:05 +0300 |
commit | 6fa119c8cc0c6f8877c104974abff852eba89d91 (patch) | |
tree | 99f79884b2828f4bd88a4f962ee5ab0473b638b7 /meta-aspeed | |
parent | 88250777182ecdb19164830f4f85370bbc89bbd2 (diff) | |
download | openbmc-6fa119c8cc0c6f8877c104974abff852eba89d91.tar.xz |
meta-aspeed: Move g6 environment
The Aspeed u-boot tree has the g6 environment at 640KiB. Move to 512KiB
for easy OpenBMC compatibility.
(From meta-aspeed rev: 5b6780e9810f79b352db7ae8c6a352d978ef2cd3)
Change-Id: I65a8c799eb1db8756516a4f46098c75ee18751d1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-aspeed')
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch | 32 | ||||
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 1 |
2 files changed, 33 insertions, 0 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..8bf99c7a1 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch @@ -0,0 +1,32 @@ +From 5cc81108739c8b5eb5679f726ae86e677e9dee65 Mon Sep 17 00:00:00 2001 +From: Brad Bishop <bradleyb@fuzziesquirrel.com> +Date: Thu, 5 Sep 2019 20:39:57 -0400 +Subject: [PATCH] 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. + +Upstream-Status: Pending +Upstream-Status: https://github.com/AspeedTech-BMC/u-boot/pull/1 +Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> +--- + include/configs/evb_ast2600.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 4e1d94545..c25bb6dbe 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 @@ -12,6 +12,7 @@ SRCREV = "9b5fc98374593c49133b709f71119222ecfff3eb" 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" S = "${WORKDIR}/git" |