diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-19 04:02:10 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-21 02:32:09 +0300 |
| commit | a09fea1d28fe3c69a64bee092f5a764274d26ca2 (patch) | |
| tree | 93c09653555ff696eb7705a74475a711cea8b316 /include/configs/omapl138_lcdk.h | |
| parent | 8160c38ca1fde4386db5a4ee07e86e397a4914df (diff) | |
| download | u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.tar.xz | |
env: Finish migration of common ENV options
- In ARMv8 NXP Layerscape platforms we also need to make use of
CONFIG_SYS_RELOC_GD_ENV_ADDR now, do so.
- On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used, drop the define
to 0.
- Add Kconfig entry for ENV_ADDR.
- Make ENV_ADDR / ENV_OFFSET depend on the env locations that use it.
- Add ENV_xxx_REDUND options that depend on their primary option and
SYS_REDUNDAND_ENVIRONMENT
- On a number of PowerPC platforms, use SPL_ENV_ADDR not CONFIG_ENV_ADDR
for the pre-main-U-Boot environment location.
- On ENV_IS_IN_SPI_FLASH, check not for CONFIG_ENV_ADDR being set but
rather it being non-zero, as it will now be zero by default.
- Rework the env_offset absolute in env/embedded.o to not use
CONFIG_ENV_OFFSET as it was the only use of ENV_OFFSET within
ENV_IS_IN_FLASH.
- Migrate all platforms.
Cc: Wolfgang Denk <wd@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: uboot-stm32@st-md-mailman.stormreply.com
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Diffstat (limited to 'include/configs/omapl138_lcdk.h')
| -rw-r--r-- | include/configs/omapl138_lcdk.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 1c41e7e97a..fc5c87cc9a 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -117,8 +117,6 @@ * Flash & Environment */ #ifdef CONFIG_NAND -#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ -#define CONFIG_ENV_SIZE (128 << 9) #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_CS 3 @@ -215,13 +213,6 @@ /* SD/MMC */ -#ifdef CONFIG_ENV_IS_IN_MMC -#undef CONFIG_ENV_SIZE -#undef CONFIG_ENV_OFFSET -#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ -#define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */ -#endif - /* defines for SPL */ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) |