blob: aa56af7dcde08234b80a79b2c3bee90715c3040e [file] [log] [blame]
Brad Bishop6aa4aaf2019-09-12 13:41:52 -04001From c89683eaf94f1f9ac899963c518d10f8abfaf00b Mon Sep 17 00:00:00 2001
Brad Bishop5b6780e2019-09-10 09:08:47 -04002From: Brad Bishop <bradleyb@fuzziesquirrel.com>
3Date: Thu, 5 Sep 2019 20:39:57 -0400
Brad Bishop6aa4aaf2019-09-12 13:41:52 -04004Subject: [PATCH v3 u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put
5 environment back at 512KiB
Brad Bishop5b6780e2019-09-10 09:08:47 -04006
7Prior to 473f430b90 the environment was at 512KiB, and compatible with
8OpenBMC. Restore OpenBMC compatibility by moving the environment back
9to 512KiB.
10
11Upstream-Status: Pending
12Upstream-Status: https://github.com/AspeedTech-BMC/u-boot/pull/1
13Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
14---
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040015v3:
16 -apply bootm address parameter change globally in aspeed-common.h
17v2:
18 -adjusted bootcmd fit address to match new image location
19---
20 include/configs/aspeed-common.h | 2 +-
21 include/configs/evb_ast2600.h | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
Brad Bishop5b6780e2019-09-10 09:08:47 -040023
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040024diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
25index 7a730d17ad..7b8b2a118d 100644
26--- a/include/configs/aspeed-common.h
27+++ b/include/configs/aspeed-common.h
28@@ -52,7 +52,7 @@
29 /*
30 * Miscellaneous configurable options
31 */
32-#define CONFIG_BOOTCOMMAND "bootm 200a0000"
33+#define CONFIG_BOOTCOMMAND "bootm 20080000"
34 #define CONFIG_ENV_OVERWRITE
35
36 #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2)
Brad Bishop5b6780e2019-09-10 09:08:47 -040037diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
38index b4de42a05a..3a12f2f0d4 100644
39--- a/include/configs/evb_ast2600.h
40+++ b/include/configs/evb_ast2600.h
41@@ -18,7 +18,7 @@
42
43 /* Environment */
44 #define CONFIG_ENV_SIZE 0x10000
45-#define CONFIG_ENV_OFFSET 0x90000
46+#define CONFIG_ENV_OFFSET 0x60000
47 #define CONFIG_ENV_SECT_SIZE (4 << 10)
48
49 #endif /* __CONFIG_H */
50--
512.21.0
52