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/T102xQDS.h | |
parent | ad38de2093035e07a09d6995a90a0d28fac75a95 (diff) | |
parent | a09fea1d28fe3c69a64bee092f5a764274d26ca2 (diff) |
Merge branch '2019-11-20-env-migration'
- Migrate a number of common environment related options to Kconfig
Diffstat (limited to 'include/configs/T102xQDS.h')
-rw-r--r-- | include/configs/T102xQDS.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index fe9a9097ce..c6b88c1654 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -122,25 +122,8 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ -#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ -#define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_OFFSET (512 * 0x800) -#elif defined(CONFIG_NAND) -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) -#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) -#define CONFIG_ENV_ADDR 0xffe20000 -#define CONFIG_ENV_SIZE 0x2000 -#elif defined(CONFIG_ENV_IS_NOWHERE) -#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) */ #endif #ifndef __ASSEMBLY__ @@ -173,9 +156,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_INIT_L3_ADDR 0xFFFC0000 #define CONFIG_SYS_L3_SIZE (256 << 10) #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024) -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_ENV_ADDR (CONFIG_SPL_GD_ADDR + 4 * 1024) -#endif +#define SPL_ENV_ADDR (CONFIG_SPL_GD_ADDR + 4 * 1024) #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SPL_GD_ADDR + 12 * 1024) #define CONFIG_SPL_RELOC_MALLOC_SIZE (30 << 10) #define CONFIG_SPL_RELOC_STACK (CONFIG_SPL_GD_ADDR + 64 * 1024) |