| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 1 | From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001 | 
| Brad Bishop | 5b6780e | 2019-09-10 09:08:47 -0400 | [diff] [blame] | 2 | From: Brad Bishop <bradleyb@fuzziesquirrel.com> | 
|  | 3 | Date: Thu, 5 Sep 2019 20:39:57 -0400 | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 4 | Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment | 
|  | 5 | back at 512KiB | 
| Brad Bishop | 5b6780e | 2019-09-10 09:08:47 -0400 | [diff] [blame] | 6 |  | 
|  | 7 | Prior to 473f430b90 the environment was at 512KiB, and compatible with | 
|  | 8 | OpenBMC.  Restore OpenBMC compatibility by moving the environment back | 
|  | 9 | to 512KiB. | 
|  | 10 |  | 
| Brad Bishop | 5b6780e | 2019-09-10 09:08:47 -0400 | [diff] [blame] | 11 | Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> | 
|  | 12 | --- | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 13 | include/configs/aspeed-common.h | 4 +++- | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 14 | include/configs/evb_ast2600.h   | 2 +- | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 15 | 2 files changed, 4 insertions(+), 2 deletions(-) | 
| Brad Bishop | 5b6780e | 2019-09-10 09:08:47 -0400 | [diff] [blame] | 16 |  | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 17 | diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 18 | index 7a730d17ad..d1eb4688e6 100644 | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 19 | --- a/include/configs/aspeed-common.h | 
|  | 20 | +++ b/include/configs/aspeed-common.h | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 21 | @@ -52,7 +52,9 @@ | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 22 | /* | 
|  | 23 | * Miscellaneous configurable options | 
|  | 24 | */ | 
|  | 25 | -#define CONFIG_BOOTCOMMAND		"bootm 200a0000" | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 26 | +#ifndef CONFIG_BOOTCOMMAND | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 27 | +#define CONFIG_BOOTCOMMAND		"bootm 20080000" | 
| Brad Bishop | 4c8b1d7 | 2019-09-26 19:26:40 -0400 | [diff] [blame] | 28 | +#endif | 
| Brad Bishop | 6aa4aaf | 2019-09-12 13:41:52 -0400 | [diff] [blame] | 29 | #define CONFIG_ENV_OVERWRITE | 
|  | 30 |  | 
|  | 31 | #define CONFIG_SYS_BOOTM_LEN 		(0x800000 * 2) | 
| Brad Bishop | 5b6780e | 2019-09-10 09:08:47 -0400 | [diff] [blame] | 32 | diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h | 
|  | 33 | index 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 | -- | 
|  | 46 | 2.21.0 | 
|  | 47 |  |