diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
| commit | ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34 (patch) | |
| tree | bd1d54ebe254cd845372cf2dec425f077afb0e13 /meta-aspeed/recipes-bsp/u-boot/files | |
| parent | 38e3aafdebeed3bf185faba0e17d8ad0ca04b879 (diff) | |
| parent | 81e9ee0bf0a3cf373ed354fb1687b5ddebc6150c (diff) | |
| download | openbmc-ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34.tar.xz | |
Merge tag 'wht-0.47' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed/recipes-bsp/u-boot/files')
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch | 47 | ||||
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config | 2 |
2 files changed, 2 insertions, 47 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 deleted file mode 100644 index e010f26c1..000000000 --- a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 5 Sep 2019 20:39:57 -0400 -Subject: [PATCH u-boot aspeed-dev-v2019.04] 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. - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - include/configs/aspeed-common.h | 4 +++- - include/configs/evb_ast2600.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h -index 7a730d17ad..d1eb4688e6 100644 ---- a/include/configs/aspeed-common.h -+++ b/include/configs/aspeed-common.h -@@ -52,7 +52,9 @@ - /* - * Miscellaneous configurable options - */ --#define CONFIG_BOOTCOMMAND "bootm 200a0000" -+#ifndef CONFIG_BOOTCOMMAND -+#define CONFIG_BOOTCOMMAND "bootm 20080000" -+#endif - #define CONFIG_ENV_OVERWRITE - - #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2) -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/files/fw_env_ast2600_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config new file mode 100644 index 000000000..ccd037ee6 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config @@ -0,0 +1,2 @@ +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd/u-boot-env 0x0000 0x10000 0x1000 |