diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-21 08:25:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-21 08:25:53 -0500 |
| commit | f0fcab6f8e11cee6d6b81a08fbfc641f6fcce0ec (patch) | |
| tree | 93c09653555ff696eb7705a74475a711cea8b316 /include/configs/P1022DS.h | |
| parent | ad38de2093035e07a09d6995a90a0d28fac75a95 (diff) | |
| parent | a09fea1d28fe3c69a64bee092f5a764274d26ca2 (diff) | |
| download | u-boot-f0fcab6f8e11cee6d6b81a08fbfc641f6fcce0ec.tar.gz | |
Merge branch '2019-11-20-env-migration'
- Migrate a number of common environment related options to Kconfig
Diffstat (limited to 'include/configs/P1022DS.h')
| -rw-r--r-- | include/configs/P1022DS.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 4b2eb6525b..db4b94ec1e 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -492,30 +492,16 @@ /* * Environment */ -#ifdef CONFIG_SPIFLASH -#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ -#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ -#define CONFIG_ENV_SECT_SIZE 0x10000 -#elif defined(CONFIG_SDCARD) +#if defined(CONFIG_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 #elif defined(CONFIG_NAND) +#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #ifdef CONFIG_TPL_BUILD -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) -#else -#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#define SPL_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) #endif -#define CONFIG_ENV_OFFSET (1024 * 1024) -#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) -#define CONFIG_ENV_SIZE 0x2000 -#else -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ +#define SPL_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #endif #define CONFIG_LOADS_ECHO |