blob: e010f26c1f4767076fd0a13d402ca51c552f6856 [file] [log] [blame]
Brad Bishop4c8b1d72019-09-26 19:26:40 -04001From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 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 Bishop4c8b1d72019-09-26 19:26:40 -04004Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment
5 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
Brad Bishop5b6780e2019-09-10 09:08:47 -040011Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
12---
Brad Bishop4c8b1d72019-09-26 19:26:40 -040013 include/configs/aspeed-common.h | 4 +++-
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040014 include/configs/evb_ast2600.h | 2 +-
Brad Bishop4c8b1d72019-09-26 19:26:40 -040015 2 files changed, 4 insertions(+), 2 deletions(-)
Brad Bishop5b6780e2019-09-10 09:08:47 -040016
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040017diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
Brad Bishop4c8b1d72019-09-26 19:26:40 -040018index 7a730d17ad..d1eb4688e6 100644
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040019--- a/include/configs/aspeed-common.h
20+++ b/include/configs/aspeed-common.h
Brad Bishop4c8b1d72019-09-26 19:26:40 -040021@@ -52,7 +52,9 @@
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040022 /*
23 * Miscellaneous configurable options
24 */
25-#define CONFIG_BOOTCOMMAND "bootm 200a0000"
Brad Bishop4c8b1d72019-09-26 19:26:40 -040026+#ifndef CONFIG_BOOTCOMMAND
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040027+#define CONFIG_BOOTCOMMAND "bootm 20080000"
Brad Bishop4c8b1d72019-09-26 19:26:40 -040028+#endif
Brad Bishop6aa4aaf2019-09-12 13:41:52 -040029 #define CONFIG_ENV_OVERWRITE
30
31 #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2)
Brad Bishop5b6780e2019-09-10 09:08:47 -040032diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
33index b4de42a05a..3a12f2f0d4 100644
34--- a/include/configs/evb_ast2600.h
35+++ b/include/configs/evb_ast2600.h
36@@ -18,7 +18,7 @@
37
38 /* Environment */
39 #define CONFIG_ENV_SIZE 0x10000
40-#define CONFIG_ENV_OFFSET 0x90000
41+#define CONFIG_ENV_OFFSET 0x60000
42 #define CONFIG_ENV_SECT_SIZE (4 << 10)
43
44 #endif /* __CONFIG_H */
45--
462.21.0
47