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/UCP1020.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/UCP1020.h')
| -rw-r--r-- | include/configs/UCP1020.h | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 40080f512b..68276a15a7 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -370,51 +370,11 @@ /* * Environment */ -#ifdef CONFIG_ENV_FIT_UCBOOT - -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x20000) -#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ - -#else - - -#ifdef CONFIG_RAMBOOT_SPIFLASH - -#define CONFIG_ENV_SIZE 0x3000 /* 12KB */ -#define CONFIG_ENV_OFFSET 0x2000 /* 8KB */ -#define CONFIG_ENV_SECT_SIZE 0x1000 - -#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#endif - -#elif defined(CONFIG_RAMBOOT_SDCARD) +#if !defined(CONFIG_ENV_FIT_UCBOOT) && defined(CONFIG_RAMBOOT_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 - -#elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) -#define CONFIG_ENV_SIZE 0x2000 - -#else -#define CONFIG_ENV_BASE (CONFIG_SYS_FLASH_BASE) -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_ADDR (CONFIG_ENV_BASE + 0xC0000) -#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #endif -#endif - -#endif /* CONFIG_ENV_FIT_UCBOOT */ - #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ |