diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-06 01:31:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-14 21:54:34 +0300 |
| commit | eda2c7c523d858d25fe25052254a7f393767310b (patch) | |
| tree | 7c14ec3de42b7fc6c86bc3b0f9ecb4b9f21a5d14 /meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch | |
| parent | 794d26fa53ad7e8cb54a3a5773436b1d8e813f35 (diff) | |
| download | openbmc-eda2c7c523d858d25fe25052254a7f393767310b.tar.xz | |
Update to internal 0.53
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch deleted file mode 100644 index 326f36df1..000000000 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3195e1ec2d772d5e4c16ae5b60c294086cfc17be Mon Sep 17 00:00:00 2001 -From: Kuiying Wang <kuiying.wang@intel.com> -Date: Thu, 12 Dec 2019 12:54:18 +0800 -Subject: [PATCH] ast2600: intel-layout-environment-addr - -Tested: -Both kernel and u-boot work at the area /dev/mtd/u-boot-env - -Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> -Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> ---- - common/board_r.c | 13 ++++++++++--- - include/configs/aspeed-common.h | 11 ++++++++++- - 2 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/common/board_r.c b/common/board_r.c -index 472987d5d52f..b665d0e30262 100644 ---- a/common/board_r.c -+++ b/common/board_r.c -@@ -433,10 +433,17 @@ static int should_load_env(void) - static int initr_env(void) - { - /* initialize environment */ -- if (should_load_env()) -- env_relocate(); -- else -+ if (should_load_env()) { -+ /* -+ * try again, in case the environment failed to load the first -+ * time -+ */ -+ if (!gd->env_valid) -+ env_init(); -+ env_relocate(); -+ } else { - set_default_env(NULL, 0); -+ } - #ifdef CONFIG_OF_CONTROL - env_set_hex("fdtcontroladdr", - (unsigned long)map_to_sysmem(gd->fdt_blob)); -diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h -index cdbffc97a223..6065ec58db0a 100644 ---- a/include/configs/aspeed-common.h -+++ b/include/configs/aspeed-common.h -@@ -65,9 +65,18 @@ - #endif - - #ifndef CONFIG_ENV_OFFSET --#define CONFIG_ENV_OFFSET 0xF0000 -+#define CONFIG_ENV_OFFSET 0x2400000 - #endif - -+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -+#define CONFIG_ENV_OVERWRITE -+ -+#define AST_FMC_CS0_BASE 0x20000000 /* CS0 */ -+#define CONFIG_ENV_ADDR (AST_FMC_CS0_BASE + CONFIG_ENV_OFFSET) -+#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -+#define CONFIG_ENV_ADDR_REDUND (AST_FMC_CS0_BASE + CONFIG_ENV_OFFSET_REDUND) -+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -+ - #define CONFIG_ENV_SECT_SIZE (4 << 10) - - /* --- -2.7.4 - |