diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:06 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:06 +0200 |
| commit | 0e8d158664a913392cb01fb11a948d83f72e105e (patch) | |
| tree | 9e0a45c86828b4549b77c7867320e867401d9c86 /include/configs | |
| parent | 1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df (diff) | |
rename CFG_ENV macros to CONFIG_ENV
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'include/configs')
432 files changed, 1906 insertions, 1906 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h index 35180d636e0..cee5560d14a 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -298,9 +298,9 @@ * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFFE0000 -#define CFG_ENV_SIZE 0x00020000 /* Size of the Environment */ -#define CFG_ENV_SECT_SIZE 0x00020000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFFE0000 +#define CONFIG_ENV_SIZE 0x00020000 /* Size of the Environment */ +#define CONFIG_ENV_SECT_SIZE 0x00020000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 0069aabab7c..cc7eddc9e54 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -163,18 +163,18 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x0400 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x0400 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #define CFG_VXWORKS_MAC_PTR (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/ #else /* Use FLASH for environment variables */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ #endif diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h index 2999b2a0b7e..9b84d1f9710 100644 --- a/include/configs/ADNPESC1.h +++ b/include/configs/ADNPESC1.h @@ -87,7 +87,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -120,12 +120,12 @@ /* Mem addr of environment */ #if defined(CONFIG_NIOS_BASE_32) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) #else -#error *** CFG_ERROR: you have to setup the environment base address CFG_ENV_ADDR +#error *** CFG_ERROR: you have to setup the environment base address CONFIG_ENV_ADDR #endif -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #else @@ -135,7 +135,7 @@ /*------------------------------------------------------------------------ * NIOS APPLICATION CODE BASE AREA *----------------------------------------------------------------------*/ -#if ((CFG_ENV_ADDR + CFG_ENV_SIZE) == 0x1050000) +#if ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) == 0x1050000) #define CFG_ADNPESC1_UPDATE_LOAD_ADDR "0x2000100" #define CFG_ADNPESC1_NIOS_APPL_ENTRY "0x1050000" #define CFG_ADNPESC1_NIOS_APPL_IDENT "0x105000c" diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 85a7ee91fe2..343123b4b7b 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -200,8 +200,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index a4582148a9e..63d400357f7 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -175,9 +175,9 @@ /* BEG ENVIRONNEMENT FLASH */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x20000 /* see README - env sector total size */ +#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* see README - env sector total size */ #endif /* END ENVIRONNEMENT FLASH */ /*----------------------------------------------------------------------- @@ -187,9 +187,9 @@ #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /* diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 882d188e1e4..fa7798e8ff0 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -292,9 +292,9 @@ extern int flash_banks; * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the */ /* beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ #define CONFIG_ENV_OVERWRITE 1 /* allow overwriting vendor vars */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 045849f76d9..18ca122a908 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -206,12 +206,12 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFFB0000 /* Address of Environment Sector*/ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ -#define CFG_ENV_SIZE 0x04000 /* Size of Environment */ +#define CONFIG_ENV_ADDR 0xFFFB0000 /* Address of Environment Sector*/ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_SIZE 0x04000 /* Size of Environment */ -#define CFG_ENV_ADDR_REDUND 0xFFFA0000 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND 0xFFFA0000 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* * Init Memory Controller: diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 56ae708eb38..228571419d0 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -234,8 +234,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index 0ce81dbaf23..8efea005d8d 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -334,9 +334,9 @@ * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/Adder.h b/include/configs/Adder.h index 3c2f4d646d8..fcac6471277 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -149,8 +149,8 @@ /* Environment is in flash */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 3b3c0bcbb11..431ed4e56fb 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -134,8 +134,8 @@ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70 /* #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 256 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 256 */ /* If CFG_AMD_BOOT is defined, the the system will boot from AMD. @@ -207,19 +207,19 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #if defined (CFG_AMD_BOOT) -#define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) -#define CFG_ENV_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV_SECT_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE) -#define CFG_ENV1_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV1_SECT_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) +#define CONFIG_ENV_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE) +#define CONFIG_ENV1_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV1_SECT_SIZE PHYS_INTEL_SECT_SIZE #else -#define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE) -#define CFG_ENV_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV_SECT_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE) -#define CFG_ENV1_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV1_SECT_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE) +#define CONFIG_ENV_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE) +#define CONFIG_ENV1_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV1_SECT_SIZE PHYS_AMD_SECT_SIZE #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h index 17f5909330a..a6e92287ff5 100644 --- a/include/configs/AmigaOneG3SE.h +++ b/include/configs/AmigaOneG3SE.h @@ -241,11 +241,11 @@ * Environment is stored in NVRAM. */ #define CONFIG_ENV_IS_IN_NVRAM 1 -#define CFG_ENV_ADDR 0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to +#define CONFIG_ENV_ADDR 0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to * protect softex's settings for now. * Original 768 bytes where not enough. */ -#define CFG_ENV_SIZE 0x8000 /* Size of the Environment. See comment above */ +#define CONFIG_ENV_SIZE 0x8000 /* Size of the Environment. See comment above */ #define CFG_CONSOLE_IS_IN_ENV 1 /* stdin/stdout/stderr are in environment */ #define CFG_CONSOLE_OVERWRITE_ROUTINE 1 diff --git a/include/configs/B2.h b/include/configs/B2.h index 1c4b6fee99e..1a8114b3173 100644 --- a/include/configs/B2.h +++ b/include/configs/B2.h @@ -49,8 +49,8 @@ * Size of malloc() pool */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Monitor */ -#define CFG_ENV_SIZE 1024 /* 1024 bytes may be used for env vars*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024 ) +#define CONFIG_ENV_SIZE 1024 /* 1024 bytes may be used for env vars*/ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024 ) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -177,7 +177,7 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x0 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_OFFSET 0x0 /* environment starts at the beginning of the EEPROM */ /*----------------------------------------------------------------------- * I2C EEPROM (STM24C02W6) for environment diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index c19f1e9f059..bfbda52090e 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -245,12 +245,12 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_SIZE 0x1ff0 /* NVRAM size (8kB), we must protect the clock data (16 bytes) */ -#define CFG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */ +#define CONFIG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */ /* * We store the environment and an image of revision eeprom in the upper part of the NVRAM. Thus, * user applications can use the remaining space for other purposes. */ -#define CFG_ENV_ADDR (CFG_NVRAM_SIZE +0x10 -0x800) +#define CONFIG_ENV_ADDR (CFG_NVRAM_SIZE +0x10 -0x800) #define CFG_NV_SROM_COPY_ADDR (CFG_NVRAM_SIZE +0x10 -0x400) #define CFG_NVRAM_ACCESS_ROUTINE /* This board needs a special routine to access the NVRAM */ #define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */ diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 09c1995f09c..7fd6490766b 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -336,9 +336,9 @@ #undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */ #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) #else /* CFG_LOWBOOT */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ @@ -359,10 +359,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/BMW.h b/include/configs/BMW.h index 5ba3e6d570a..d5a398d1110 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -292,9 +292,9 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 #define CONFIG_ENV_OVERWRITE 1 #define CFG_NVRAM_ACCESS_ROUTINE 1 -#define CFG_ENV_ADDR 0x7c004000 /* right at the start of NVRAM */ -#define CFG_ENV_SIZE 0x1ff0 /* Size of the Environment - 8K */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_ADDR 0x7c004000 /* right at the start of NVRAM */ +#define CONFIG_ENV_SIZE 0x1ff0 /* Size of the Environment - 8K */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ /* * Cache Configuration diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index d50be015f59..be588389c0e 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -156,16 +156,16 @@ #if 0 /* Use FLASH for environment variables */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ #endif diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index b9c998eec68..8862898ce39 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -394,10 +394,10 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ -#define CFG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ -#define CFG_ENV_ADDR_REDUND 0xFFFFA000 -#define CFG_ENV_SIZE_REDUND 0x2000 +#define CONFIG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ +#define CONFIG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ +#define CONFIG_ENV_ADDR_REDUND 0xFFFFA000 +#define CONFIG_ENV_SIZE_REDUND 0x2000 #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/CCM.h b/include/configs/CCM.h index 52b7b82cdc7..435e8ecf59b 100644 --- a/include/configs/CCM.h +++ b/include/configs/CCM.h @@ -219,17 +219,17 @@ #if 1 /* Start port with environment in flash; switch to SPI EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 2048 -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_OFFSET 2048 +#define CONFIG_ENV_SIZE 2048 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index f157b5f7542..7c5efc2ea68 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -249,8 +249,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ /*----------------------------------------------------------------------- diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 7ec48a127d8..a338af0e5c1 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -325,10 +325,10 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x7F8000) -#define CFG_ENV_SIZE 0x4000 /* Size of the Environment */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ -#define CFG_ENV_SECT_SIZE 0x8000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x7F8000) +#define CONFIG_ENV_SIZE 0x4000 /* Size of the Environment */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SECT_SIZE 0x8000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 8b205c77207..bd627e198fd 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -201,8 +201,8 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ /*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index 9a076ba14d6..85231341b60 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -237,15 +237,15 @@ * NVRAM organization */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ #endif diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 357c213173e..228821a04e4 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -252,15 +252,15 @@ * NVRAM organization */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ -#define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */ +#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8)) /* Env */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #endif diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index 431054d3949..065b85547ab 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -264,8 +264,8 @@ /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC32 is 4096 bytes */ #define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */ diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 53228c1b46d..ffbe0363466 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -255,15 +255,15 @@ * NVRAM organization */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ -#define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */ +#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8)) /* Env */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #endif diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index 7a185e847e1..46f80d1d67d 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -573,18 +573,18 @@ #if 0 #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ -/* #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ +/* #define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */ #endif #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #define CFG_EEPROM_PAGE_WRITE_BITS 5 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20 #define CFG_I2C_EEPROM_ADDR 0x050 -#define CFG_ENV_OFFSET 0x200 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x600 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x200 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x600 /* 2048 bytes may be used for env vars*/ #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index 958b11151e4..bfb42421f5c 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -201,8 +201,8 @@ #define CFG_EEPROM_PAGE_WRITE_ENABLE #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ /* diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 443b976495f..5f4e0c76a5b 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -326,9 +326,9 @@ /* environment is in Flash */ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_ROM -# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000) -# define CFG_ENV_SIZE 0x10000 -# define CFG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x70000) +# define CONFIG_ENV_SIZE 0x10000 +# define CONFIG_ENV_SECT_SIZE 0x10000 #endif #else /* environment is in EEPROM */ @@ -339,8 +339,8 @@ #define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07 #define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */ -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (2048 - 512) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (2048 - 512) #endif /* diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 45075fa2e38..e087624e9f4 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -341,9 +341,9 @@ /* environment is in Flash */ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_ROM -# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000) -# define CFG_ENV_SIZE 0x10000 -# define CFG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x70000) +# define CONFIG_ENV_SIZE 0x10000 +# define CONFIG_ENV_SECT_SIZE 0x10000 #endif #else /* environment is in EEPROM */ @@ -354,8 +354,8 @@ #define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07 #define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */ -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (2048 - 512) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (2048 - 512) #endif /* diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index c15a02ab961..4639d30b6d2 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -169,10 +169,10 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */ -#define CFG_ENV_OFFSET 0x3c8000 +#define CONFIG_ENV_OFFSET 0x3c8000 #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment area */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment area */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ /* Memory tests: U-BOOT relocates itself to the top of Ram, so its at * 32meg-(128k+some_malloc_space+copy-of-ENV sector).. @@ -186,7 +186,7 @@ #define CFG_MALLOC_LEN (128 << 10) /* 128k for malloc space */ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ - + CFG_ENV_SECT_SIZE \ + + CONFIG_ENV_SECT_SIZE \ + CFG_STACK_USAGE ) #define CFG_MEMTEST_END (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE) diff --git a/include/configs/CU824.h b/include/configs/CU824.h index 3320c9aee7b..a40df76f3e8 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -273,13 +273,13 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #if 0 -#define CFG_ENV_ADDR 0xFF008000 -#define CFG_ENV_SIZE 0x8000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFF008000 +#define CONFIG_ENV_SIZE 0x8000 /* Size of the Environment Sector */ #else -#define CFG_ENV_ADDR 0xFFFC0000 -#define CFG_ENV_SIZE 0x4000 /* Size of the Environment */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFFC0000 +#define CONFIG_ENV_SIZE 0x4000 /* Size of the Environment */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 24370c93fdc..3ddf1bf3f53 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -158,13 +158,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #if 0 -#define CFG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ #else -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 3fc280fc388..0edd51abfa4 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -560,10 +560,10 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CFG_FLASH_CFI 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ -/* #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ +/* #define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 59a934e6943..30615a464fe 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -498,10 +498,10 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CFG_FLASH_CFI 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ -/* #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ +/* #define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index a1f4e0dc73b..3e1fc0affce 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -82,7 +82,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -112,8 +112,8 @@ #if (CFG_NIOS_CPU_FLASH_SIZE != 0) #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #else diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index eda328ab3ec..12d4e6b427c 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -90,7 +90,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -122,14 +122,14 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #if defined(CONFIG_NIOS_STANDARD_32) -#define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ +#define CONFIG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ #elif defined(CONFIG_NIOS_MTX_LDK_20) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) #else -#error *** CFG_ERROR: you have to setup the environment base address CFG_ENV_ADDR +#error *** CFG_ERROR: you have to setup the environment base address CONFIG_ENV_ADDR #endif -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #else diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 50d44a0326e..acc2bd2639e 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -217,8 +217,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 811b9c3f9b6..7debc69af31 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -228,8 +228,8 @@ #define CFG_EEPROM_PAGE_WRITE_ENABLE #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ /* diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 37a7e3ae87e..9f8c423b437 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -137,19 +137,19 @@ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 0 /* environment starts at */ +#define CONFIG_ENV_OFFSET 0 /* environment starts at */ /* the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */ +#define CONFIG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */ #endif /* diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index 80a6cb7bec6..a949454f7ea 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -51,17 +51,17 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_ADDR 0xF003C000 /* End of 256K */ -#define CFG_ENV_SECT_SIZE 0x4000 +#define CONFIG_ENV_ADDR 0xF003C000 /* End of 256K */ +#define CONFIG_ENV_SECT_SIZE 0x4000 #define CONFIG_ENV_IS_IN_FLASH 1 /* -#define CFG_ENV_IS_EMBEDDED 1 -#define CFG_ENV_ADDR_REDUND 0xF0018000 -#define CFG_ENV_SECT_SIZE_REDUND 0x4000 +#define CONFIG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_ADDR_REDUND 0xF0018000 +#define CONFIG_ENV_SECT_SIZE_REDUND 0x4000 */ #else -#define CFG_ENV_ADDR 0xFFE04000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xFFE04000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index 8c684001156..08e3d711348 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -220,10 +220,10 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_SIZE 0x800 /* NVRAM size (2kB) */ -#define CFG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */ -#define CFG_ENV_ADDR 0x0 -#define CFG_ENV_MAP_ADRS 0xff000000 -#define CFG_NV_SROM_COPY_ADDR (CFG_ENV_ADDR + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */ +#define CONFIG_ENV_ADDR 0x0 +#define CONFIG_ENV_MAP_ADRS 0xff000000 +#define CFG_NV_SROM_COPY_ADDR (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #define CFG_NVRAM_ACCESS_ROUTINE /* only byte accsess alowed */ #define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */ diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index 11eca4c4d57..c6a3b8b7000 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -214,8 +214,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #if defined(CONFIG_ENV_IS_IN_FLASH) -# define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ -# define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ +# define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- @@ -226,8 +226,8 @@ /* 8 top NVRAM locations */ #if defined(CONFIG_ENV_IS_IN_NVRAM) -# define CFG_ENV_ADDR CFG_NVRAM_BASE /* Base address of NVRAM area */ -# define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_ADDR CFG_NVRAM_BASE /* Base address of NVRAM area */ +# define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h index aaf61726db1..90e36375336 100644 --- a/include/configs/EP1C20.h +++ b/include/configs/EP1C20.h @@ -63,7 +63,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -87,9 +87,9 @@ * (which is common practice). *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ -#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) /*------------------------------------------------------------------------ * CONSOLE diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h index ae1e476fd34..ae9409f4841 100644 --- a/include/configs/EP1S10.h +++ b/include/configs/EP1S10.h @@ -62,7 +62,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) /* 256k heap */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024) /* 256k heap */ #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -85,9 +85,9 @@ * (which is common practice). *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) /*------------------------------------------------------------------------ * CONSOLE diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h index 7aedcca1dbe..95ae14772bf 100644 --- a/include/configs/EP1S40.h +++ b/include/configs/EP1S40.h @@ -62,7 +62,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) /* 256k heap */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024) /* 256k heap */ #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -85,9 +85,9 @@ * (which is common practice). *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) /*------------------------------------------------------------------------ * CONSOLE diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index 81d5e55461d..106cc6fba52 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -144,8 +144,8 @@ /* Environment is in flash */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* We use one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* We use one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_OR0_PRELIM 0xFC000160 #define CFG_BR0_PRELIM (CFG_FLASH_BASE | BR_PS_32 | BR_MS_GPCM | BR_V) diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index b7ec0d01058..c3c7aa4f96e 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -49,8 +49,8 @@ #endif #if 0 #define CONFIG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars */ #endif /* total size of a X1240 is 2048 bytes */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ @@ -299,15 +299,15 @@ /* BEG ENVIRONNEMENT FLASH */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (128*1024) +#define CONFIG_ENV_SECT_SIZE (128*1024) #if 0 /* force ENV to be NOT embedded */ -#define CFG_ENV_ADDR 0xfffa0000 +#define CONFIG_ENV_ADDR 0xfffa0000 #else /* force ENV to be embedded */ -#define CFG_ENV_SIZE (2 * 1024) /* Total Size of Environment Sector 2k */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CFG_ENV_SIZE - 0x10) /* let space for reset vector */ -/* #define CFG_ENV_ADDR (CFG_MONITOR_BASE)*/ -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_SIZE (2 * 1024) /* Total Size of Environment Sector 2k */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SIZE - 0x10) /* let space for reset vector */ +/* #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE)*/ +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) #endif #endif @@ -319,9 +319,9 @@ #define CFG_NVRAM_SIZE 0x7F8 /* NVRAM size 2kByte - 8 Byte for RTC */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x7F8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x7F8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /* diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h index 24f0f4c1fbe..02539e26308 100644 --- a/include/configs/ESTEEM192E.h +++ b/include/configs/ESTEEM192E.h @@ -155,8 +155,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h index 940e53d23a3..adf79c73761 100644 --- a/include/configs/ETX094.h +++ b/include/configs/ETX094.h @@ -173,11 +173,11 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_FLASH_16BIT -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ #else -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index 2a78fd648b9..f98831e7d8d 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -392,9 +392,9 @@ #define CFG_FLASH_CFI 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index fed8d4247f9..5ba1706b226 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -57,8 +57,8 @@ #define CFG_I2C_EEPROM_ADDR_OVERFLOW 1 /* ... and 1 bit in I2C address */ #define CFG_EEPROM_PAGE_WRITE_BITS 3 /* 4 bytes per page */ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 40 /* write takes up to 40 msec */ -#define CFG_ENV_OFFSET 4 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 350 /* that is 350 bytes only! */ +#define CONFIG_ENV_OFFSET 4 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 350 /* that is 350 bytes only! */ #endif #define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */ @@ -189,9 +189,9 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00060000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x00010000 /* see README - env sector total size */ +#define CONFIG_ENV_OFFSET 0x00060000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x00010000 /* see README - env sector total size */ #endif /* On Chip Memory location/size */ diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h index c6c7b533be7..abf51ef0145 100644 --- a/include/configs/FADS823.h +++ b/include/configs/FADS823.h @@ -204,8 +204,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /*----------------------------------------------------------------------- diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h index 82a875719e6..d6178689a6a 100644 --- a/include/configs/FADS850SAR.h +++ b/include/configs/FADS850SAR.h @@ -154,8 +154,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /*----------------------------------------------------------------------- diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index e7fcf751981..52b5ab46799 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -163,8 +163,8 @@ * assigne a whole sector for the environment, so that we can safely * erase and write it without disturbing the boot sector */ -#define CFG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index 2b819c52f12..dd8051d6377 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -202,12 +202,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index b3380dbbcbc..1af28b39f54 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -202,12 +202,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/G2000.h b/include/configs/G2000.h index 43926a280c9..81a12f159d6 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -300,15 +300,15 @@ */ #if 1 /* test-only */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #else /* DEFAULT: environment in flash, using redundand flash sectors */ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_ADDR 0xFFFA0000 /* environment starts before u-boot */ -#define CFG_ENV_SECT_SIZE 0x20000 /* 128k bytes may be used for env vars*/ +#define CONFIG_ENV_ADDR 0xFFFA0000 /* environment starts before u-boot */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k bytes may be used for env vars*/ #endif diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 6a5a316dd22..1627344458e 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -166,7 +166,7 @@ #define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 byte pages */ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12 /* 10 mS w/ 20% margin */ #define CFG_I2C_EEPROM_ADDR_LEN 2 /* need 16 bit address */ -#define CFG_ENV_EEPROM_SIZE (32 * 1024) +#define CONFIG_ENV_EEPROM_SIZE (32 * 1024) /* * Enable I2C and select the hardware/software driver @@ -438,17 +438,17 @@ #define CONFIG_ENV_IS_IN_EEPROM #if defined(CONFIG_ENV_IS_IN_EEPROM) -#define CFG_ENV_SIZE (2 * 1024) -#define CFG_ENV_OFFSET (CFG_ENV_EEPROM_SIZE - (8 * 1024)) +#define CONFIG_ENV_SIZE (2 * 1024) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_EEPROM_SIZE - (8 * 1024)) #else -#define CFG_ENV_SIZE 0x1000 -#define CFG_ENV_SECT_SIZE CFG_FLASH_SECT_SIZE +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_SECT_SIZE CFG_FLASH_SECT_SIZE /* * This ultimately gets passed right into the linker script, so we have to * use a number :( */ -#define CFG_ENV_OFFSET 0x060000 +#define CONFIG_ENV_OFFSET 0x060000 #endif /* diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h index 3cf7fb1d1a3..b6cc17b52dd 100644 --- a/include/configs/GENIETV.h +++ b/include/configs/GENIETV.h @@ -197,8 +197,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector (64k)*/ +#define CONFIG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector (64k)*/ /* values according to the manual */ diff --git a/include/configs/GTH.h b/include/configs/GTH.h index d5816ae2f6b..18bbbc3f292 100644 --- a/include/configs/GTH.h +++ b/include/configs/GTH.h @@ -196,10 +196,10 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #undef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 0x000E0000 -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x000E0000 +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x50000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x50000 /* see README - env sector total size */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/HH405.h b/include/configs/HH405.h index cf5fcf12cba..7ff03b17a70 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -321,8 +321,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF4080000 /* NVRAM base address */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 5168be0dc04..c8c040930d8 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -146,8 +146,8 @@ #define CFG_FLASH_BASE 0xFFE00000 #define CFG_FLASH_SIZE (2 * 1024 * 1024) /* Unity has onboard 1MByte flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ #define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index 406c352644b..807781c1c23 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -235,12 +235,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index 89927069519..0727606bbb8 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -233,8 +233,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h index c80165ba59f..a4944f160b3 100644 --- a/include/configs/IAD210.h +++ b/include/configs/IAD210.h @@ -221,8 +221,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index caf7210a64e..0ff7fa9e6b5 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -230,10 +230,10 @@ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00F40000 +#define CONFIG_ENV_OFFSET 0x00F40000 -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment sector */ -#define CFG_ENV_SIZE 0x4000 /* Used Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Used Size of Environment Sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /*----------------------------------------------------------------------- diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 459654e546e..4d0397c4579 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -252,9 +252,9 @@ /* Environment in flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x60000) -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x60000) +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 /*----------------------------------------------------------------------- * NAND-FLASH stuff diff --git a/include/configs/IP860.h b/include/configs/IP860.h index fa3c29ec9a7..c0bf3673028 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -193,13 +193,13 @@ #define CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_ADDR 0x20000000 /* use SRAM */ -#define CFG_ENV_SIZE (16<<10) /* use 16 kB */ +#define CONFIG_ENV_ADDR 0x20000000 /* use SRAM */ +#define CONFIG_ENV_SIZE (16<<10) /* use 16 kB */ #endif /* CONFIG_ENV_IS_IN_NVRAM */ #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 512 /* Leave 512 bytes free for other data */ -#define CFG_ENV_SIZE 1536 /* Use remaining space */ +#define CONFIG_ENV_OFFSET 512 /* Leave 512 bytes free for other data */ +#define CONFIG_ENV_SIZE 1536 /* Use remaining space */ #endif /* CONFIG_ENV_IS_IN_EEPROM */ /*----------------------------------------------------------------------- diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index cea85320473..31fbf329222 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -209,8 +209,8 @@ /* Environment in FLASH, there is little space left in Serial EEPROM */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x10000) /* 2. sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x10000) /* 2. sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index 6de40da4ed7..8b6f3ce0523 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -186,11 +186,11 @@ /* Environment is in flash, there is little space left in Serial EEPROM */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Hard Reset Configuration Words diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index ee302d9a61f..6a422c8e2fd 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -185,8 +185,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index 1bdd0318e6a..54477eec27b 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -181,8 +181,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 804fc3f69ce..a705ac1a8cf 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -213,26 +213,26 @@ #define CFG_FLASH_BASE 0xFE000000 #define CFG_FLASH_SIZE 0x01000000 #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x01760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x01760000 + 0x00800000) #else /* CFG_LOWBOOT */ #if defined(CFG_LOWBOOT08) # error CFG_LOWBOOT08 is incompatible with the Lite5200B #endif #if defined(CFG_LOWBOOT16) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x01060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x01060000) #endif #endif /* CFG_LOWBOOT */ #else /* !CONFIG_LITE5200B (IceCube)*/ #define CFG_FLASH_BASE 0xFF000000 #define CFG_FLASH_SIZE 0x01000000 #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00740000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00740000 + 0x00800000) #else /* CFG_LOWBOOT */ #if defined(CFG_LOWBOOT08) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000 + 0x00800000) #endif #if defined(CFG_LOWBOOT16) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) #endif #endif /* CFG_LOWBOOT */ #endif /* CONFIG_LITE5200B */ @@ -256,11 +256,11 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SIZE 0x10000 #if defined(CONFIG_LITE5200B) -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #else -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/JSE.h b/include/configs/JSE.h index 4bcd17a6ee9..b457272be35 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -92,8 +92,8 @@ #define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* Put the environment in the second half. */ -#define CFG_ENV_OFFSET 0x00 -#define CFG_ENV_SIZE 512 +#define CONFIG_ENV_OFFSET 0x00 +#define CONFIG_ENV_SIZE 512 /* The JSE connects UART1 to the console tap connector. */ diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 897d8a05927..eeb39241d7e 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -146,8 +146,8 @@ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */ -#define CFG_ENV_SIZE 0x1000 /* Size of Env vars */ -#define CFG_ENV_ADDR (CFG_NVRAM_BASE_ADDR) +#define CONFIG_ENV_SIZE 0x1000 /* Size of Env vars */ +#define CONFIG_ENV_ADDR (CFG_NVRAM_BASE_ADDR) #define CONFIG_BOOTDELAY 5 /* 5 second autoboot */ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index e40e53bb2fa..6f99c1b318e 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -255,14 +255,14 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Address and size of Redundant Environment Sector */ #if 0 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index 29c3e2d7bac..a71be0f261b 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -267,14 +267,14 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Address and size of Redundant Environment Sector */ #if 0 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index dc6084877c1..8b7b1e1b929 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -186,8 +186,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 10b37b5e01f..7f24c4e59f4 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -194,15 +194,15 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OVERWRITE 1 -#undef CFG_ENV_IS_EMBEDDED +#undef CONFIG_ENV_IS_EMBEDDED /*----------------------------------------------------------------------- * FLASH organization */ #define CFG_FLASH_BASE CFG_CS0_BASE #define CFG_FLASH0_BASE CFG_CS0_BASE -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x8000) -#define CFG_ENV_SECT_SIZE 0x8000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x8000) +#define CONFIG_ENV_SECT_SIZE 0x8000 #define CFG_FLASH_CFI #ifdef CFG_FLASH_CFI diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 3f55594a3c4..f352db123d2 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -221,15 +221,15 @@ * Environment is embedded in u-boot in the second sector of the flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 #ifdef NORFLASH_PS32BIT -# define CFG_ENV_OFFSET (0x8000) -# define CFG_ENV_SIZE 0x4000 -# define CFG_ENV_SECT_SIZE 0x4000 +# define CONFIG_ENV_OFFSET (0x8000) +# define CONFIG_ENV_SIZE 0x4000 +# define CONFIG_ENV_SECT_SIZE 0x4000 #else -# define CFG_ENV_OFFSET (0x4000) -# define CFG_ENV_SIZE 0x2000 -# define CFG_ENV_SECT_SIZE 0x2000 +# define CONFIG_ENV_OFFSET (0x4000) +# define CONFIG_ENV_SIZE 0x2000 +# define CONFIG_ENV_SECT_SIZE 0x2000 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index c7544a8ebbc..4525e2df2fd 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -114,9 +114,9 @@ #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x2000 /* see README - env sector total size */ +#define CONFIG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x2000 /* see README - env sector total size */ /*----------------------------------------------------------------------- * Start addresses for the final memory configuration diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 72dd05db663..8d9bfa3dd09 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -43,12 +43,12 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifdef CONFIG_MONITOR_IS_IN_RAM -# define CFG_ENV_OFFSET 0x4000 -# define CFG_ENV_SECT_SIZE 0x1000 +# define CONFIG_ENV_OFFSET 0x4000 +# define CONFIG_ENV_SECT_SIZE 0x1000 # define CONFIG_ENV_IS_IN_FLASH 1 #else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) -# define CFG_ENV_SECT_SIZE 0x1000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +# define CONFIG_ENV_SECT_SIZE 0x1000 # define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index cbf50fe7135..f58f89cfb21 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -43,12 +43,12 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #else -#define CFG_ENV_ADDR 0xffe04000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index 482c262c811..844b74fb606 100644 --- a/include/configs/M5271EVB.h +++ b/include/configs/M5271EVB.h @@ -51,11 +51,11 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_OFFSET 0x4000 #else -#define CFG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_ADDR 0xffe04000 #endif -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 22124c961f2..d2dcdd28a5c 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -52,13 +52,13 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 #else -#define CFG_ENV_ADDR 0xffe04000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 0a30e0b1ede..b0ef41ec2c8 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -52,13 +52,13 @@ * Environment is embedded in u-boot in the second sector of the flash */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 #else -#define CFG_ENV_ADDR 0xffe04000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 1763f97b65e..5cc64c167f2 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -48,8 +48,8 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_ADDR 0xffe04000 -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 /* diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 441f209c4af..3a8e49a8891 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -228,10 +228,10 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index f8212c6551a..34698eee37d 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -228,10 +228,10 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index d0a66ea8fe0..03d21bec4dd 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -267,17 +267,17 @@ */ #if defined(CONFIG_CF_SBF) # define CONFIG_ENV_IS_IN_SPI_FLASH 1 -# define CFG_ENV_SPI_CS 1 -# define CFG_ENV_OFFSET 0x20000 -# define CFG_ENV_SIZE 0x2000 -# define CFG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_SPI_CS 1 +# define CONFIG_ENV_OFFSET 0x20000 +# define CONFIG_ENV_SIZE 0x2000 +# define CONFIG_ENV_SECT_SIZE 0x10000 #else # define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) -# define CFG_ENV_SECT_SIZE 0x2000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +# define CONFIG_ENV_SECT_SIZE 0x2000 #endif #undef CONFIG_ENV_OVERWRITE -#undef CFG_ENV_IS_EMBEDDED +#undef CONFIG_ENV_IS_EMBEDDED /*----------------------------------------------------------------------- * FLASH organization diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 9872d58d22a..9513279fed2 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -332,12 +332,12 @@ */ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH -# define CFG_ENV_SPI_CS 1 +# define CONFIG_ENV_SPI_CS 1 #else # define CONFIG_ENV_IS_IN_FLASH 1 #endif #undef CONFIG_ENV_OVERWRITE -#undef CFG_ENV_IS_EMBEDDED +#undef CONFIG_ENV_IS_EMBEDDED /*----------------------------------------------------------------------- * FLASH organization @@ -347,24 +347,24 @@ # define CFG_FLASH0_BASE CFG_SER_FLASH_BASE # define CFG_FLASH1_BASE CFG_CS0_BASE # define CFG_FLASH2_BASE CFG_CS1_BASE -# define CFG_ENV_OFFSET 0x30000 -# define CFG_ENV_SIZE 0x2000 -# define CFG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_OFFSET 0x30000 +# define CONFIG_ENV_SIZE 0x2000 +# define CONFIG_ENV_SECT_SIZE 0x10000 #endif #ifdef CFG_ATMEL_BOOT # define CFG_FLASH_BASE CFG_CS0_BASE # define CFG_FLASH0_BASE CFG_CS0_BASE # define CFG_FLASH1_BASE CFG_CS1_BASE -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) -# define CFG_ENV_SECT_SIZE 0x2000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +# define CONFIG_ENV_SECT_SIZE 0x2000 #endif #ifdef CFG_INTEL_BOOT # define CFG_FLASH_BASE CFG_CS0_BASE # define CFG_FLASH0_BASE CFG_CS0_BASE # define CFG_FLASH1_BASE CFG_CS1_BASE -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) -# define CFG_ENV_SIZE 0x2000 -# define CFG_ENV_SECT_SIZE 0x20000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +# define CONFIG_ENV_SIZE 0x2000 +# define CONFIG_ENV_SECT_SIZE 0x20000 #endif #define CFG_FLASH_CFI diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 7913879489c..37b1c603dca 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -277,10 +277,10 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_OFFSET 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index df92a244193..482136e1149 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -263,10 +263,10 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_OFFSET 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MBX.h b/include/configs/MBX.h index 44e1861884e..fed4d7399d2 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -194,8 +194,8 @@ * access the NVRAM at the offset 0x1000. */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */ -#define CFG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000) -#define CFG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000) +#define CONFIG_ENV_SIZE 0x1000 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index 4a537e8104e..cc051115211 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -144,8 +144,8 @@ * access the NVRAM at the offset 0x1000. */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */ -#define CFG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000) -#define CFG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000) +#define CONFIG_ENV_SIZE 0x1000 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index b972390b046..16d236388e4 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -208,8 +208,8 @@ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */ -#define CFG_ENV_SIZE 0x1000 /* Size of Env vars */ -#define CFG_ENV_ADDR (CFG_NVRAM_BASE_ADDR) +#define CONFIG_ENV_SIZE 0x1000 /* Size of Env vars */ +#define CONFIG_ENV_ADDR (CFG_NVRAM_BASE_ADDR) #define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none " #define CONFIG_BOOTCOMMAND "tftp 8000000 pImage.metrobox;bootm 8000000" diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index de7cb128f3e..a7901e5655f 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -229,8 +229,8 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET CFG_MONITOR_LEN /* Offset of Environment */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment */ +#define CONFIG_ENV_OFFSET CFG_MONITOR_LEN /* Offset of Environment */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index e0f938625c8..4527c17eac7 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -115,8 +115,8 @@ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x00000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x00800 /* 2k bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x00000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x00800 /* 2k bytes may be used for env vars */ /*************************************************************** * Definitions for Serial Presence Detect EEPROM address diff --git a/include/configs/ML2.h b/include/configs/ML2.h index a2703b1688b..11323dbe845 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -185,9 +185,9 @@ /* BEG ENVIRONNEMENT FLASH */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #endif /* END ENVIRONNEMENT FLASH */ /*----------------------------------------------------------------------- @@ -197,9 +197,9 @@ #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /* diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index b145166f030..b69ced66233 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -299,13 +299,13 @@ #if 0 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Size of the Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Size of the Environment Sector */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 -#define CFG_ENV_ADDR NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/ -#define CFG_ENV_OFFSET CFG_ENV_ADDR -#define CFG_ENV_SIZE NV_U_BOOT_ENV_SIZE /* 2K */ +#define CONFIG_ENV_ADDR NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/ +#define CONFIG_ENV_OFFSET CONFIG_ENV_ADDR +#define CONFIG_ENV_SIZE NV_U_BOOT_ENV_SIZE /* 2K */ #endif /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 9a767323103..763ad4ca2e7 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -381,12 +381,12 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_SECT_SIZE 0x40000 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE) +# define CONFIG_ENV_SECT_SIZE 0x40000 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE) #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index e062717e6b7..26c6fbe5023 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -428,12 +428,12 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -# define CFG_ENV_SECT_SIZE 0x40000 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +# define CONFIG_ENV_SECT_SIZE 0x40000 #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index aef35781cde..55d78528dba 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -209,7 +209,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ @@ -386,23 +386,23 @@ */ #if defined(CONFIG_NAND_U_BOOT) #define CONFIG_ENV_IS_IN_NAND 1 - #define CFG_ENV_OFFSET (512 * 1024) - #define CFG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE - #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE - #define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE - #define CFG_ENV_RANGE (CFG_ENV_SECT_SIZE * 4) - #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_RANGE) + #define CONFIG_ENV_OFFSET (512 * 1024) + #define CONFIG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE + #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE + #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE + #define CONFIG_ENV_RANGE (CONFIG_ENV_SECT_SIZE * 4) + #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #elif !defined(CFG_RAMBOOT) #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 /* Address and size of Redundant Environment Sector */ #else #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 92a6218427e..5879a823b85 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -378,14 +378,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 7e4849a9130..977142b10f3 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -155,7 +155,7 @@ #undef CFG_RAMBOOT #endif -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ @@ -392,14 +392,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x20000 - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x20000 + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 3102272ae39..01cf557bab5 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -143,7 +143,7 @@ #undef CFG_RAMBOOT #endif -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ @@ -404,14 +404,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x20000 - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x20000 + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index d737cb44fa0..87f1672f1a1 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -466,19 +466,19 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 7635c65e361..fa0c0a71500 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -274,7 +274,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ @@ -414,15 +414,15 @@ boards, we say we have two, but don't display a message if we find only one. */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH /* Flash is not usable now */ #undef CONFIG_FLASH_CFI_DRIVER #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO /* echo on for serial download */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 37173cc4675..f60d7a7b03c 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -168,7 +168,7 @@ #undef CFG_RAMBOOT #endif -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ @@ -435,14 +435,14 @@ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x20000 - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x20000 + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index b20f16504af..b2e6b3b84df 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -340,14 +340,14 @@ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ -#define CFG_ENV_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x20000 #else /* CFG_RAMBOOT */ #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +#define CONFIG_ENV_SIZE 0x2000 #endif /* CFG_RAMBOOT */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 21d7d2dd64d..7c873889803 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -203,7 +203,7 @@ #undef CFG_RAMBOOT #endif -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ @@ -422,14 +422,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 7ffc743c351..2ac4ad0fa45 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -443,14 +443,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) - #define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ - #define CFG_ENV_SIZE 0x4000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) + #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ + #define CONFIG_ENV_SIZE 0x4000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE-0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index f290075d8ee..2578bef2781 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -448,12 +448,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 -#define CFG_ENV_ADDR 0xfff80000 +#define CONFIG_ENV_ADDR 0xfff80000 #else -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) #endif -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 0dc10965cec..0f5f8348581 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -382,14 +382,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index d4df8a613b6..ee4f41f8efa 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -257,19 +257,19 @@ #ifndef CFG_RAMBOOT #if defined(CONFIG_RAM_AS_FLASH) #define CONFIG_ENV_IS_NOWHERE -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) +#define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #endif -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SIZE 0x2000 #else /* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +#define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_BOOTARGS "root=/dev/ram rw console=ttyS0,115200" diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 569952daef4..6a400f577e0 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -406,9 +406,9 @@ extern unsigned long get_clock_freq(void); * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 02776b35fd7..b6508742254 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -396,12 +396,12 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 -#define CFG_ENV_ADDR 0xfff80000 +#define CONFIG_ENV_ADDR 0xfff80000 #else -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x70000) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x70000) #endif -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) */ +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 4afb7aeee54..68bc10607ba 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -467,9 +467,9 @@ extern unsigned long get_clock_freq(void); * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index c5213365387..ab4bc8641fb 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -404,9 +404,9 @@ extern unsigned long get_clock_freq(void); * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 72a8b25f484..2bd8724895e 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -413,14 +413,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 5b1cf6f919b..80697a5ce31 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -425,9 +425,9 @@ extern unsigned long get_clock_freq(void); * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 94c02408f58..d7e3a887cf8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -428,12 +428,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 -#define CFG_ENV_ADDR 0xfff80000 +#define CONFIG_ENV_ADDR 0xfff80000 #else -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x70000) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x70000) #endif -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 744110f36c6..4eee21ca856 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -439,13 +439,13 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +#define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 7b5c402e9b9..fc55febeeec 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -505,13 +505,13 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) - #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) + #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index 4a7540ec592..88d80721821 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -281,9 +281,9 @@ * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFFF0000 -#define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFFF0000 +#define CONFIG_ENV_SIZE 0x00010000 /* Size of the Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index bf06ef831a2..21475fb665b 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -218,11 +218,11 @@ #define CONFIG_ENV_IS_IN_FLASH #undef CFG_FLASH_PROTECTION -#define CFG_ENV_ADDR 0xFFFE0000 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR 0xFFFE0000 +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* * Memory map @@ -243,7 +243,7 @@ #define CFG_RAMBOOT 1 #endif -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (512 << 10) #define CFG_MALLOC_LEN (512 << 10) #define CFG_BOOTMAPSZ (8 << 20) diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index b8288571ab3..ec36f55420c 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -139,7 +139,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ #define CFG_MONITOR_LEN (512 * 1024) #define CFG_MALLOC_LEN (512 * 1024) @@ -256,11 +256,11 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFF800000 -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR 0xFF800000 +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_LOADS_ECHO #define CFG_LOADS_BAUD_CHANGE diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 819e72542e2..2518dbe30e9 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -330,9 +330,9 @@ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00010000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 +#define CONFIG_ENV_OFFSET 0x00010000 +#define CONFIG_ENV_SIZE 0x00010000 +#define CONFIG_ENV_SECT_SIZE 0x00010000 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h index df1586bdfe3..da8231c2bff 100644 --- a/include/configs/MVS1.h +++ b/include/configs/MVS1.h @@ -177,8 +177,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */ -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector (bottom boot sector) */ -#define CFG_ENV_SIZE 0x2000 /* Used Size of Environment Sector 8k */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector (bottom boot sector) */ +#define CONFIG_ENV_SIZE 0x2000 /* Used Size of Environment Sector 8k */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 59d6e9a131f..7d90e1674a6 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -132,12 +132,12 @@ /* ENV setting */ #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 -#define CFG_ENV_SECT_SIZE (128 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) /* Offset of env Flash sector relative to CFG_FLASH_BASE */ -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) /* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 22bd0f070c2..3e64a7ef8e5 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -233,10 +233,10 @@ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00740000 +#define CONFIG_ENV_OFFSET 0x00740000 -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ -#define CFG_ENV_SIZE 0x4000 /* Used Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Used Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index ac4c42493e6..7cc6364bda2 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -217,15 +217,15 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_OFFSET_REDUND 0 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_OFFSET_REDUND 0 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 80aee5bc2aa..805b82a5a7f 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -221,15 +221,15 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_OFFSET_REDUND 0 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_OFFSET_REDUND 0 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index 6cb39d9f836..687db1d2e97 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -218,15 +218,15 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_OFFSET_REDUND 0 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_OFFSET_REDUND 0 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index 0d318e8247a..e55003028d9 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -188,15 +188,15 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_OFFSET_REDUND 0 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_OFFSET_REDUND 0 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 9991d699761..e297c84abcc 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -208,12 +208,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/NX823.h b/include/configs/NX823.h index eddb52bece2..1f4c329f828 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -150,11 +150,11 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #define xEMBED #ifdef EMBED -#define CFG_ENV_SIZE 0x200 /* FIXME How big when embedded?? */ -#define CFG_ENV_ADDR CFG_MONITOR_BASE +#define CONFIG_ENV_SIZE 0x200 /* FIXME How big when embedded?? */ +#define CONFIG_ENV_ADDR CFG_MONITOR_BASE #else -#define CFG_ENV_ADDR 0x40020000 /* absolute address for now */ -#define CFG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */ +#define CONFIG_ENV_ADDR 0x40020000 /* absolute address for now */ +#define CONFIG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */ #endif #define CFG_FLASH_SN_BASE 0x4001fff0 /* programmer automagically puts */ diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index f839eadd46c..17b00a15f9b 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -192,16 +192,16 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ #endif diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index 18f14bc8f16..4f4b13ddbf4 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -190,16 +190,16 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */ /* total size of a CAT24WC08 is 1024 bytes */ #endif diff --git a/include/configs/OXC.h b/include/configs/OXC.h index d9b4224fe1e..2ccaf47411c 100644 --- a/include/configs/OXC.h +++ b/include/configs/OXC.h @@ -194,9 +194,9 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ -#define CFG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */ +#define CONFIG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */ #define CONFIG_ENV_OVERWRITE 1 /* Allow modifying the environment */ /* diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 232044b084f..815009182d5 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -398,9 +398,9 @@ #define CFG_FLASH_CFI 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR 0xFFFE0000 +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR 0xFFFE0000 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 96150447c71..42b155e5134 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -174,14 +174,14 @@ #define CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 2048 #endif #undef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SIZE 0x00002000 /* Set whole sector as env */ -#define CFG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CFG_ENV_SIZE) /* Environment starts at this adress */ +#define CONFIG_ENV_SIZE 0x00002000 /* Set whole sector as env */ +#define CONFIG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CONFIG_ENV_SIZE) /* Environment starts at this adress */ #endif diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 6c6a4703d92..2837b51175c 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -219,15 +219,15 @@ * NVRAM organization */ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ -#define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */ +#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8)) /* Env */ #else /* Use EEPROM for environment variables */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars*/ /* total size of a CAT24WC08 is 1024 bytes */ #endif diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index 94f6f93454c..b88a17344b8 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -61,7 +61,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (128 * 1024) /* Reserve 128k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -85,9 +85,9 @@ * (which is common practice). *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ -#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) /*------------------------------------------------------------------------ * CONSOLE diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index af3b8ee5a2a..048e8964d6b 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -222,9 +222,9 @@ * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_SIZE 0x1000 /* Size of the Environment */ -#define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_SIZE 0x1000 /* Size of the Environment */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index e229bde246f..acaab7fbf69 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -224,9 +224,9 @@ * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) -#define CFG_ENV_SIZE 0x1000 /* Size of the Environment */ -#define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) +#define CONFIG_ENV_SIZE 0x1000 /* Size of the Environment */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 7876177f04a..895b89c2046 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -96,8 +96,8 @@ #define CFG_I2C_EEPROM_ADDR 0x53 #define CFG_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */ #undef CFG_I2C_EEPROM_ADDR_OVERFLOW #define CFG_EEPROM_PAGE_WRITE_BITS 6 /* The Atmel 24C128/256 has */ diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index 48e9269d99b..5d2bc2f9249 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -63,7 +63,7 @@ *----------------------------------------------------------------------*/ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */ #define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN) @@ -87,9 +87,9 @@ * (which is common practice). *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ -#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ +#define CONFIG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ -#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) /*------------------------------------------------------------------------ * CONSOLE diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 75cdc2fcfb9..8463ed52b99 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -274,8 +274,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* reseve 0x100 bytes for strapping */ -#define CFG_ENV_SIZE 0x700 +#define CONFIG_ENV_OFFSET 0x100 /* reseve 0x100 bytes for strapping */ +#define CONFIG_ENV_SIZE 0x700 /* * I2C EEPROM (24WC16) for environment diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 4da84ca9ff6..2676d7d357f 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -212,7 +212,7 @@ #define CFG_FLASH_SIZE 0x04000000 #define CFG_BOOTROM_BASE 0xFFF00000 #define CFG_BOOTROM_SIZE 0x00080000 -#define CFG_ENV_ADDR (0xFDF00000 + 0x40000) +#define CONFIG_ENV_ADDR (0xFDF00000 + 0x40000) #else /* * Flash configuration (8,16 or 32 MB) @@ -225,7 +225,7 @@ */ #define CFG_FLASH_BASE 0xFC000000 #define CFG_FLASH_SIZE 0x04000000 -#define CFG_ENV_ADDR (0xFFF00000 + 0x40000) +#define CONFIG_ENV_ADDR (0xFFF00000 + 0x40000) #endif #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */ @@ -246,8 +246,8 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 0782ff0c470..f6253613f19 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -258,9 +258,9 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) -#define CFG_ENV_SIZE 0x40000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x40000) +#define CONFIG_ENV_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 @@ -268,8 +268,8 @@ #define CFG_I2C_EEPROM_ADDR_LEN 1 #define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */ -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (2048 - 512) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (2048 - 512) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/PM828.h b/include/configs/PM828.h index a342824ef4c..f437d21c69b 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -251,9 +251,9 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) -#define CFG_ENV_SIZE 0x40000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x40000) +#define CONFIG_ENV_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 @@ -261,8 +261,8 @@ #define CFG_I2C_EEPROM_ADDR_LEN 1 #define CFG_EEPROM_PAGE_WRITE_BITS 4 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */ -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (2048 - 512) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (2048 - 512) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 8babcb2730b..1beee0fb4c6 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -294,14 +294,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 9690bd7631c..9d535b6bb47 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -294,14 +294,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index f6274229013..e5430592d19 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -245,8 +245,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 7a787761d2b..467a11c1078 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -108,7 +108,7 @@ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /*----------------------------------------------------------------------- @@ -137,18 +137,18 @@ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 0 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */ #endif /* @@ -205,9 +205,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/sequoia/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/PN62.h b/include/configs/PN62.h index 074e8a1a98e..192cbd411f8 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -161,8 +161,8 @@ #define CFG_NO_FLASH 1 /* There is no FLASH memory */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ -#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ #define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 81085ec0df2..cc3ef1c3925 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -418,16 +418,16 @@ #ifdef ENVIRONMENT_IN_EEPROM #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/ #else /* DEFAULT: environment in flash, using redundand flash sectors */ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ -#define CFG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ -#define CFG_ENV_ADDR_REDUND 0xFFFFA000 -#define CFG_ENV_SIZE_REDUND 0x2000 +#define CONFIG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ +#define CONFIG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ +#define CONFIG_ENV_ADDR_REDUND 0xFFFFA000 +#define CONFIG_ENV_SIZE_REDUND 0x2000 #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/QS823.h b/include/configs/QS823.h index 3c7fc6f9067..258605806e1 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -224,9 +224,9 @@ * Environment variable storage is in FLASH, one sector before U-boot */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ -#define CFG_ENV_SIZE 0x2000 /* 8kb */ -#define CFG_ENV_ADDR 0xffee0000 /* address of env sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ +#define CONFIG_ENV_SIZE 0x2000 /* 8kb */ +#define CONFIG_ENV_ADDR 0xffee0000 /* address of env sector */ /*----------------------------------------------------------------------- * Miscellaneous configurable options diff --git a/include/configs/QS850.h b/include/configs/QS850.h index 44daf520c19..87a184b0ba8 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -224,9 +224,9 @@ * Environment variable storage is in FLASH, one sector before U-boot */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ -#define CFG_ENV_SIZE 0x2000 /* 8kb */ -#define CFG_ENV_ADDR 0xffee0000 /* address of env sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ +#define CONFIG_ENV_SIZE 0x2000 /* 8kb */ +#define CONFIG_ENV_ADDR 0xffee0000 /* address of env sector */ /*----------------------------------------------------------------------- * Miscellaneous configurable options diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index dd792463016..54dbc308baf 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -133,8 +133,8 @@ CONFIG_SPI * Environment variable storage is in NVRAM */ #define CONFIG_ENV_IS_IN_NVRAM 1 -#define CFG_ENV_SIZE 0x00001000 /* We use only the last 4K for PPCBoot */ -#define CFG_ENV_ADDR 0xD100E000 +#define CONFIG_ENV_SIZE 0x00001000 /* We use only the last 4K for PPCBoot */ +#define CONFIG_ENV_ADDR 0xD100E000 /* * Miscellaneous configurable options diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 26729fcb682..001ac1cf0f6 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -230,9 +230,9 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ -#define CFG_ENV_SIZE 0x4000 /* Used Size of Environment sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Used Size of Environment sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /*----------------------------------------------------------------------- diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 8f594509083..aec204b8d51 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -204,8 +204,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index 50345e53e97..4fa21b8fe38 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -220,13 +220,13 @@ #if 0 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x8000 -#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x8000 +#define CONFIG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 -#define CFG_ENV_ADDR 0xfa000100 -#define CFG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR 0xfa000100 +#define CONFIG_ENV_SIZE 0x1000 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index 2e4710ac6f5..2870659c67f 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -156,8 +156,8 @@ #define CFG_DIRECT_FLASH_TFTP #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index 724dc48eb2c..6e72e9668e0 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -230,12 +230,12 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_ADDR 0xFA000100 -#define CFG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR 0xFA000100 +#define CONFIG_ENV_SIZE 0x1000 #else #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x30000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x30000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ #endif /* CONFIG_ENV_IS_IN_NVRAM */ #define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res))) diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index 8bdb4015085..e805213bd25 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -126,7 +126,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT +#define CONFIG_ENV_IN_OWN_SECT /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -302,18 +302,18 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -# define CFG_ENV_SECT_SIZE 0x40000 +# ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +# define CONFIG_ENV_SECT_SIZE 0x40000 # else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -# define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ -# endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ +# endif /* CONFIG_ENV_IN_OWN_SECT */ #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ /*----------------------------------------------------------------------- diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 22d3da614dd..541d58690fb 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -228,12 +228,12 @@ #define CFG_FLASH_WRITE_TOUT (1 * CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index e603f29b3b3..6ec52e69f7c 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -226,8 +226,8 @@ #define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_DEFAULT_IMMR 0xFF010000 diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index 64f23205744..2cf75e3d0be 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -334,19 +334,19 @@ #if !defined(CFG_RAMBOOT) #if defined(CONFIG_RAM_AS_FLASH) #define CONFIG_ENV_IS_NOWHERE - #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) + #define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) - #define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */ + #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) + #define CONFIG_ENV_SIZE 0x2000 /* CONFIG_ENV_SECT_SIZE */ #endif #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600" diff --git a/include/configs/SCM.h b/include/configs/SCM.h index bc779de8040..50cf499b76b 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -271,14 +271,14 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) -#define CFG_ENV_SIZE 0x40000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x40000) +#define CONFIG_ENV_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 2048 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h index 56436a4354e..89d1461066c 100644 --- a/include/configs/SL8245.h +++ b/include/configs/SL8245.h @@ -258,9 +258,9 @@ * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFFF0000 -#define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */ -#define CFG_ENV_SECT_SIZE 0x00010000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFFF0000 +#define CONFIG_ENV_SIZE 0x00010000 /* Size of the Environment */ +#define CONFIG_ENV_SECT_SIZE 0x00010000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 138dbd24c7f..d30c7bcf476 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -164,8 +164,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index 583ee211144..45fe14b419a 100644 --- a/include/configs/SMN42.h +++ b/include/configs/SMN42.h @@ -49,7 +49,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -192,9 +192,9 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* The Environment Sector is in the CPU-internal flash */ #define CFG_FLASH_BASE 0 -#define CFG_ENV_OFFSET 0x3C000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x3C000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index 39ab1c80a6f..929a4b6aaf2 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -168,8 +168,8 @@ #define CFG_FLASH_WRITE_TOUT 0 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x0800 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x0800 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/SX1.h b/include/configs/SX1.h index d1b6998b969..ff4e1a01f7f 100644 --- a/include/configs/SX1.h +++ b/include/configs/SX1.h @@ -46,7 +46,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -172,7 +172,7 @@ #define PHYS_FLASH_SIZE (16 << 10) /* 16 MB */ #define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */ #define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ #define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE } @@ -190,12 +190,12 @@ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_SIZE_REDUND 0x20000 -#define CFG_ENV_OFFSET_REDUND 0x40000 +#define CONFIG_ENV_SIZE_REDUND 0x20000 +#define CONFIG_ENV_OFFSET_REDUND 0x40000 #endif /* __CONFIG_H */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 67b6071be1d..0cc4fe431cd 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -452,15 +452,15 @@ #define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH /* environment is in FLASH */ - #define CFG_ENV_ADDR 0xF8040000 /* AM29LV641 or AM29LV800BT */ - #define CFG_ENV_ADDR_REDUND 0xF8050000 /* AM29LV641 or AM29LV800BT */ - #define CFG_ENV_SECT_SIZE 0x00010000 - #define CFG_ENV_SIZE 0x00002000 + #define CONFIG_ENV_ADDR 0xF8040000 /* AM29LV641 or AM29LV800BT */ + #define CONFIG_ENV_ADDR_REDUND 0xF8050000 /* AM29LV641 or AM29LV800BT */ + #define CONFIG_ENV_SECT_SIZE 0x00010000 + #define CONFIG_ENV_SIZE 0x00002000 #else /* environment is in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 - #define CFG_ENV_OFFSET 0 /* at beginning of EEPROM */ - #define CFG_ENV_SIZE 1024 /* Use only a part of it*/ + #define CONFIG_ENV_OFFSET 0 /* at beginning of EEPROM */ + #define CONFIG_ENV_SIZE 1024 /* Use only a part of it*/ #endif #if 1 diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 7c880ab5ad3..9898a8b8b62 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -177,8 +177,8 @@ #define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */ #endif #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ #define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index 39f66cbdb31..41835f01e01 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -147,8 +147,8 @@ #define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */ #endif #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ #define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h index 1b2b70a4521..dd074dc5cd7 100644 --- a/include/configs/TASREG.h +++ b/include/configs/TASREG.h @@ -196,9 +196,9 @@ #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFC40000 /* Address of Environment Sector*/ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_ADDR 0xFFC40000 /* Address of Environment Sector*/ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ /*----------------------------------------------------------------------- * Start addresses for the final memory configuration diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 97a8d6f8a0e..e4e13670790 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -263,12 +263,12 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) #else /* CFG_LOWBOOT */ #if defined(CONFIG_TQM5200_B) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000) #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* CONFIG_TQM5200_B */ #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks @@ -297,13 +297,13 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SIZE 0x10000 #if defined(CONFIG_TQM5200_B) -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_TQM5200_B */ /* diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 99829169ccf..2efc10a6cf9 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -255,13 +255,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index 083686c28d2..38183686a94 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -233,7 +233,7 @@ #define CFG_FLASH_BASE 0xff000000 #define CFG_FLASH_SIZE 0x01000000 #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0) #define CFG_MAX_FLASH_SECT 256 /* max num of sects on one chip */ @@ -272,8 +272,8 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */ -#define CFG_ENV_OFFSET 0x1000 -#define CFG_ENV_SIZE 0x0700 +#define CONFIG_ENV_OFFSET 0x1000 +#define CONFIG_ENV_SIZE 0x0700 /* * VPD settings diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index 288019fbbb7..b2708321705 100644 --- a/include/configs/TOP860.h +++ b/include/configs/TOP860.h @@ -161,8 +161,8 @@ */ #define CONFIG_SOFT_I2C #define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */ -#define CFG_ENV_OFFSET 0x1000 -#define CFG_ENV_SIZE 0x0700 +#define CONFIG_ENV_OFFSET 0x1000 +#define CONFIG_ENV_SIZE 0x0700 #define CFG_I2C_EEPROM_ADDR 0x57 #define CFG_FACT_OFFSET 0x1800 #define CFG_FACT_SIZE 0x0800 diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index d91d2e51b2b..efc8da498ce 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -399,11 +399,11 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 #if defined (CONFIG_CAM5200) -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) #elif defined(CONFIG_TQM5200_B) -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000) +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000) #else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* Dynamic MTD partition support */ @@ -457,14 +457,14 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */ +#define CONFIG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */ #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200) -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #endif /* CONFIG_TQM5200_B */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index a979351166f..631190295cc 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -216,12 +216,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 86432c6eaeb..53272e17220 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -211,13 +211,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 46ecb5127a0..2d54d2399f0 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -307,14 +307,14 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) -#define CFG_ENV_SIZE 0x40000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x40000) +#define CONFIG_ENV_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 2048 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 8642a9f610b..4e8cccd9a73 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -382,11 +382,11 @@ #define CFG_UPDATE_FLASH_SIZE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND 0x20000 /* Where is the Hardwareinformation Block (from Monitor Sources) */ #define MON_RES_LENGTH (0x0003FC00) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 0d47d70fd13..3fd46a0966d 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -301,14 +301,14 @@ extern int tqm834x_num_flash_banks; #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 1a808961764..812cea16c05 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -201,12 +201,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 4626f2ef277..512c55dc0ce 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -200,13 +200,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 6582d97a119..36e2fbf2e2d 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -206,12 +206,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 2ff208c44a7..2da1f3ae09c 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -240,13 +240,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index c6bb4f902ea..fcf0f59ba57 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -561,14 +561,14 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_TQM_FLASH_N_TYPE -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K (one sector) for env */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K (one sector) for env */ #else /* !CONFIG_TQM_FLASH_N_TYPE */ -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */ #endif /* CONFIG_TQM_FLASH_N_TYPE */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ @@ -678,20 +678,20 @@ * Setup some board specific values for the default environment variables */ #ifdef CONFIG_CPM2 -#define CFG_ENV_CONSDEV "consdev=ttyCPM0\0" +#define CONFIG_ENV_CONSDEV "consdev=ttyCPM0\0" #else -#define CFG_ENV_CONSDEV "consdev=ttyS0\0" +#define CONFIG_ENV_CONSDEV "consdev=ttyS0\0" #endif -#define CFG_ENV_FDT_FILE "fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \ +#define CONFIG_ENV_FDT_FILE "fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \ MK_STR(CONFIG_HOSTNAME)".dtb\0" -#define CFG_ENV_BOOTFILE "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0" -#define CFG_ENV_UBOOT "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \ +#define CONFIG_ENV_BOOTFILE "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0" +#define CONFIG_ENV_UBOOT "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \ "uboot_addr="MK_STR(TEXT_BASE)"\0" #define CONFIG_EXTRA_ENV_SETTINGS \ - CFG_ENV_BOOTFILE \ - CFG_ENV_FDT_FILE \ - CFG_ENV_CONSDEV \ + CONFIG_ENV_BOOTFILE \ + CONFIG_ENV_FDT_FILE \ + CONFIG_ENV_CONSDEV \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$serverip:$rootpath\0" \ @@ -715,7 +715,7 @@ "fdt_addr=ffec0000\0" \ "kernel_addr=ffd00000\0" \ "ramdisk_addr=ff800000\0" \ - CFG_ENV_UBOOT \ + CONFIG_ENV_UBOOT \ "load=tftp 100000 $uboot\0" \ "update=protect off $uboot_addr +$filesize;" \ "erase $uboot_addr +$filesize;" \ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 1daf8666baf..87462a56112 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -205,12 +205,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index dcdcdc1ae94..9dc874550c5 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -205,13 +205,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 53a8f345030..c039e9d3e30 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -209,12 +209,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 41a0cac8a3e..cc5ee6da076 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -209,13 +209,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 3e50cd4223b..bf3bbb264a3 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -249,13 +249,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index ebdf17d3971..66f4a982ddb 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -252,13 +252,13 @@ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Hardware Information Block diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 16584ecbc37..19b3be7dba8 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -224,17 +224,17 @@ #endif /* CONFIG_TOTAL5200_REV */ #if defined(CFG_LOWBOOT) -# define CFG_ENV_ADDR 0xFE040000 +# define CONFIG_ENV_ADDR 0xFE040000 #else /* CFG_LOWBOOT */ -# define CFG_ENV_ADDR 0xFFF40000 +# define CONFIG_ENV_ADDR 0xFFF40000 #endif /* CFG_LOWBOOT */ /* * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x40000 -#define CFG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_SIZE 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 9822d7d428e..aeb649e190f 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -90,8 +90,8 @@ #define CFG_I2C_EEPROM_ADDR 0x50 #define CFG_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x000 /* environment starts at offset 0 */ -#define CFG_ENV_SIZE 0x800 /* 2KB should be more than enough */ +#define CONFIG_ENV_OFFSET 0x000 /* environment starts at offset 0 */ +#define CONFIG_ENV_SIZE 0x800 /* 2KB should be more than enough */ #undef CFG_I2C_EEPROM_ADDR_OVERFLOW #define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 bytes page write mode on 24C256 */ @@ -100,7 +100,7 @@ /* * Size of malloc() pool */ -/*#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)*/ +/*#define CONFIG_MALLOC_SIZE (CONFIG_ENV_SIZE + 128*1024)*/ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CFG_MONITOR_LEN (256 * 1024) @@ -226,12 +226,12 @@ #ifdef CONFIG_AMD_LV800 #define PHYS_FLASH_SIZE 0x00100000 /* 1MB */ #define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ #endif #ifdef CONFIG_AMD_LV400 #define PHYS_FLASH_SIZE 0x00080000 /* 512KB */ #define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ #endif /* timeout values are in ticks */ @@ -240,7 +240,7 @@ #if 0 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index 5d36f24c336..d5c0a5e05c0 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -267,8 +267,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index eb8cbc81fe9..b952e0cbd42 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -192,8 +192,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index d8d97e84fba..f72da78dcc4 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -260,9 +260,9 @@ /* environment in flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00020000) -#define CFG_ENV_SIZE 0x00020000 -#define CFG_ENV_SECT_SIZE 0x00020000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00020000) +#define CONFIG_ENV_SIZE 0x00020000 +#define CONFIG_ENV_SECT_SIZE 0x00020000 /* * Initial memory map for linux diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index 2471a44172f..95e45560767 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -252,20 +252,20 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */ #define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -/*define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env */ -#define CFG_ENV_ADDR CFG_NVRAM_BASE_ADDR +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +/*define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env */ +#define CONFIG_ENV_ADDR CFG_NVRAM_BASE_ADDR #else /* Use Boot Flash for environment variables */ /*----------------------------------------------------------------------- * Flash EEPROM for environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */ +#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of env. sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index fe09c9a1305..9c5bbff9fee 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -259,20 +259,20 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */ #define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -/*define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env */ -#define CFG_ENV_ADDR CFG_NVRAM_BASE_ADDR +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +/*define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env */ +#define CONFIG_ENV_ADDR CFG_NVRAM_BASE_ADDR #else /* Use Boot Flash for environment variables */ /*----------------------------------------------------------------------- * Flash EEPROM for environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */ +#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of env. sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index 9c0bd4398e4..c3fc3afeac5 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -230,8 +230,8 @@ * Environment Variable setup */ #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/ /* total size of a CAT24WC16 is 2048 bytes */ #define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */ diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h index c3b0e083f91..77b29f48af3 100644 --- a/include/configs/XPEDITE1K.h +++ b/include/configs/XPEDITE1K.h @@ -152,8 +152,8 @@ extern void out32(unsigned int, unsigned long); * Environment *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_SIZE 0x100 /* Size of Environment vars */ -#define CFG_ENV_OFFSET 0x100 +#define CONFIG_ENV_SIZE 0x100 /* Size of Environment vars */ +#define CONFIG_ENV_OFFSET 0x100 #define CFG_I2C_EEPROM_ADDR 0x50 /* this is actually the second page of the eeprom */ #define CFG_I2C_EEPROM_ADDR_LEN 1 #define CFG_EEPROM_PAGE_WRITE_ENABLE diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index ef230e15dfa..cbc1ed688a7 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -134,8 +134,8 @@ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70 /* #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 256 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 256 */ /* If CFG_AMD_BOOT is defined, the the system will boot from AMD. @@ -207,19 +207,19 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #if defined (CFG_AMD_BOOT) -#define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) -#define CFG_ENV_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV_SECT_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE) -#define CFG_ENV1_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV1_SECT_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) +#define CONFIG_ENV_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE) +#define CONFIG_ENV1_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV1_SECT_SIZE PHYS_INTEL_SECT_SIZE #else -#define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE) -#define CFG_ENV_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV_SECT_SIZE PHYS_INTEL_SECT_SIZE -#define CFG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE) -#define CFG_ENV1_SIZE PHYS_AMD_SECT_SIZE -#define CFG_ENV1_SECT_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE) +#define CONFIG_ENV_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE PHYS_INTEL_SECT_SIZE +#define CONFIG_ENV1_ADDR (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE) +#define CONFIG_ENV1_SIZE PHYS_AMD_SECT_SIZE +#define CONFIG_ENV1_SECT_SIZE PHYS_AMD_SECT_SIZE #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 5fade6332eb..59cca0b6074 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -225,11 +225,11 @@ #endif #ifdef CONFIG_ENV_IS_IN_FLASH -# define CFG_ENV_SECT_SIZE 0x10000 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +# define CONFIG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #else -# define CFG_ENV_ADDR (CFG_EEPROM + 0x400) -# define CFG_ENV_SIZE 0x1000 +# define CONFIG_ENV_ADDR (CFG_EEPROM + 0x400) +# define CONFIG_ENV_SIZE 0x1000 # define CFG_NVRAM_ACCESS_ROUTINE #endif diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index 1b713884839..170553ceb9d 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -350,9 +350,9 @@ #define CFG_FLASH_CFI 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ -#define CFG_ENV_ADDR (0xfff80000 - CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ +#define CONFIG_ENV_ADDR (0xfff80000 - CONFIG_ENV_SECT_SIZE) /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/acadia.h b/include/configs/acadia.h index ffaaa847a37..1b1fd296c3b 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -99,7 +99,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /*----------------------------------------------------------------------- @@ -124,13 +124,13 @@ #endif #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* @@ -185,9 +185,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/sequoia/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/actux1.h b/include/configs/actux1.h index d18c4b5848b..ec1d4693c8c 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -52,7 +52,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE 128 @@ -203,8 +203,8 @@ * one flash sector, embedded in uboot area (bottom bootblock flash) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/actux2.h b/include/configs/actux2.h index f6919a5edf5..a3f5a4a43cb 100644 --- a/include/configs/actux2.h +++ b/include/configs/actux2.h @@ -43,7 +43,7 @@ #undef CONFIG_USE_IRQ /* Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE 128 @@ -180,8 +180,8 @@ * one flash sector, embedded in uboot area (bottom bootblock flash) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/actux3.h b/include/configs/actux3.h index dfc8967d299..fc2d02fc39b 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -43,7 +43,7 @@ #undef CONFIG_USE_IRQ /* Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE 128 @@ -180,8 +180,8 @@ * one flash sector, embedded in uboot area (bottom bootblock flash) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/actux4.h b/include/configs/actux4.h index 48d3713f368..83bd7f569a2 100644 --- a/include/configs/actux4.h +++ b/include/configs/actux4.h @@ -43,7 +43,7 @@ #undef CONFIG_USE_IRQ /* Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE 128 @@ -177,8 +177,8 @@ /* environment organization: one complete 4k flash sector */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000) +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000) #define CONFIG_EXTRA_ENV_SETTINGS \ "mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \ diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index eb6a6454a1a..d99f23fcd06 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -322,17 +322,17 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 /* This has to be a multiple of the Flash sector size */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x2000 #ifdef CONFIG_BKUP_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* one sector (256K) for env */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* one sector (256K) for env */ #else -#define CFG_ENV_SECT_SIZE 0x40000 /* one sector (256K) for env */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* one sector (256K) for env */ #endif /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/aev.h b/include/configs/aev.h index bd7dab2f7bb..2dcaa581e5a 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -233,9 +233,9 @@ #undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */ #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) #else /* CFG_LOWBOOT */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ @@ -247,10 +247,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/alpr.h b/include/configs/alpr.h index ee60644ad00..c80c76afd56 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -95,13 +95,13 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 79f4d11447a..cfcd85c6b4c 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -162,12 +162,12 @@ /* ENV setting */ #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 -#define CFG_ENV_SECT_SIZE (128 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) /* Offset of env Flash sector relative to CFG_FLASH_BASE */ -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) /* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 diff --git a/include/configs/apollon.h b/include/configs/apollon.h index 6e34ddfef17..edfae2743f3 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -72,8 +72,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */ /* @@ -226,6 +226,6 @@ /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */ #define CFG_ONENAND_BASE 0x00000000 #define CONFIG_ENV_IS_IN_ONENAND 1 -#define CFG_ENV_ADDR 0x00020000 +#define CONFIG_ENV_ADDR 0x00020000 #endif /* __CONFIG_H */ diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index 45b20bdc4a1..668c2c10a16 100644 --- a/include/configs/armadillo.h +++ b/include/configs/armadillo.h @@ -50,7 +50,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -148,8 +148,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/assabet.h b/include/configs/assabet.h index 3cc4db43acb..28864ea16ff 100644 --- a/include/configs/assabet.h +++ b/include/configs/assabet.h @@ -45,7 +45,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */ /* @@ -163,10 +163,10 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #if defined(CONFIG_ENV_IS_IN_FLASH) -#define CFG_ENV_IN_OWN_SECTOR 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) -#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_IN_OWN_SECTOR 1 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) +#define CONFIG_ENV_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE #endif #endif /* __CONFIG_H */ diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index fb5358c787c..fd06245f4cd 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -150,9 +150,9 @@ /* bootstrap + u-boot + env + linux in dataflash */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x72000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock1 " \ @@ -165,9 +165,9 @@ /* bootstrap + u-boot + env + linux in norflash */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_MONITOR_BASE (PHYS_FLASH_1 + 0x8000) -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_BOOTCOMMAND "cp.b 0x10040000 0x72000000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock4 " \ @@ -192,7 +192,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN ROUND(CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_MALLOC_LEN ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000) #define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ #define CONFIG_STACKSIZE (32*1024) /* regular stack */ diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index 31d84d21623..000eb0edf73 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -76,7 +76,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -182,17 +182,17 @@ #undef CONFIG_ENV_IS_IN_DATAFLASH #ifdef CONFIG_ENV_IS_IN_DATAFLASH -#define CFG_ENV_OFFSET 0x20000 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x2000 /* 0x8000 */ +#define CONFIG_ENV_OFFSET 0x20000 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ #else #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_SKIP_LOWLEVEL_INIT -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ -#define CFG_ENV_SIZE 0x2000 /* 0x8000 */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ +#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ #else -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ -#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ +#define CONFIG_ENV_SIZE 0x10000 /* sectors are 64K here */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 0ddc079463d..41d1da32c34 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -136,9 +136,9 @@ /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ @@ -150,9 +150,9 @@ /* bootstrap + u-boot + env + linux in dataflash on CS1 */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ @@ -163,9 +163,9 @@ /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x60000 -#define CFG_ENV_OFFSET_REDUND 0x80000 -#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ +#define CONFIG_ENV_OFFSET 0x60000 +#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ @@ -190,7 +190,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) #define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ #define CONFIG_STACKSIZE (32*1024) /* regular stack */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index a4a08315d11..80c3b034e26 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -150,9 +150,9 @@ /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ @@ -163,9 +163,9 @@ /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x60000 -#define CFG_ENV_OFFSET_REDUND 0x80000 -#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ +#define CONFIG_ENV_OFFSET 0x60000 +#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ @@ -190,7 +190,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) #define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ #define CONFIG_STACKSIZE (32*1024) /* regular stack */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 1d243119608..b4368effa18 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -156,9 +156,9 @@ /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ @@ -169,9 +169,9 @@ /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x60000 -#define CFG_ENV_OFFSET_REDUND 0x80000 -#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ +#define CONFIG_ENV_OFFSET 0x60000 +#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ @@ -194,7 +194,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) #define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ #define CONFIG_STACKSIZE (32*1024) /* regular stack */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 8162475ff38..32168dc4329 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -125,9 +125,9 @@ /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_ENV_IS_IN_DATAFLASH 1 #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -#define CFG_ENV_OFFSET 0x4200 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x4200 +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ @@ -138,9 +138,9 @@ /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x60000 -#define CFG_ENV_OFFSET_REDUND 0x80000 -#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ +#define CONFIG_ENV_OFFSET 0x60000 +#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ @@ -163,7 +163,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) #define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ #define CONFIG_STACKSIZE (32*1024) /* regular stack */ diff --git a/include/configs/atc.h b/include/configs/atc.h index a7b154ddbdb..02ec2392160 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -271,13 +271,13 @@ #if 1 /* environment is in Flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x30000) -# define CFG_ENV_SIZE 0x10000 -# define CFG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x30000) +# define CONFIG_ENV_SIZE 0x10000 +# define CONFIG_ENV_SECT_SIZE 0x10000 #else #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 2048 #define CFG_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #endif /* diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 12da7f09060..5c286380953 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -154,8 +154,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 4a9a94e3655..faa7a01b6fe 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -178,8 +178,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 62c1aff85bb..e3084d49910 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -161,8 +161,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index a9a94841e16..c87c5b7afc1 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -161,8 +161,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index c454ec01c87..fe7a99bec09 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -178,8 +178,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 2485477876c..31c725f0113 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -106,7 +106,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /*----------------------------------------------------------------------- @@ -127,13 +127,13 @@ #define CFG_FLASH_2ND_ADDR 0x87800000 /* bamboo has 8 and 16bit device */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /* @@ -188,9 +188,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/sequoia/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- @@ -234,8 +234,8 @@ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_SIZE 0x200 /* Size of Environment vars */ -#define CFG_ENV_OFFSET 0x0 +#define CONFIG_ENV_SIZE 0x200 /* Size of Environment vars */ +#define CONFIG_ENV_OFFSET 0x0 #endif /* CONFIG_ENV_IS_IN_EEPROM */ /* diff --git a/include/configs/barco.h b/include/configs/barco.h index cbf5868a31c..9afb10edc6f 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -167,8 +167,8 @@ #define CFG_FLASH_BASE 0xFFF00000 #define CFG_FLASH_SIZE (8 * 1024 * 1024) /* Unity has onboard 1MByte flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x000047A4 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x000047A4 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ /* #define ENV_CRC 0x8BF6F24B XXX - FIXME: gets defined automatically */ #define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h index 08fb639c153..b35e362d8d7 100644 --- a/include/configs/bf533-ezkit.h +++ b/include/configs/bf533-ezkit.h @@ -139,8 +139,8 @@ #define CFG_MAX_FLASH_SECT 40 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x20020000 -#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR 0x20020000 +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ /* JFFS Partition offset set */ #define CFG_JFFS2_FIRST_BANK 0 diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 2e71780d07b..6e138b86200 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -103,16 +103,16 @@ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER) #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x12A) /* 0x12A is the length of LDR file header */ +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_HEADER (CONFIG_ENV_OFFSET + 0x12A) /* 0x12A is the length of LDR file header */ #else #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x20004000 -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_ADDR 0x20004000 +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) #endif -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 /* Total Size of Environment Sector */ #define ENV_IS_EMBEDDED #define CFG_FLASH_ERASE_TOUT 30000 /* Timeout for Chip Erase (in ms) */ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 5224eb2ff0d..01e185a9f3e 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -236,15 +236,15 @@ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER) #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */ +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_HEADER (CONFIG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */ #else #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x20004000 -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_ADDR 0x20004000 +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) #endif -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 /* Total Size of Environment Sector */ #define ENV_IS_EMBEDDED /* JFFS Partition offset set */ diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index ff10650eb76..59a0f3f6c21 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -83,8 +83,8 @@ #define CFG_FLASH_BASE 0x20000000 #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 135 /* max number of sectors on one chip */ -#define CFG_ENV_ADDR 0x20020000 -#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR 0x20020000 +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ /* JFFS Partition offset set */ #define CFG_JFFS2_FIRST_BANK 0 #define CFG_JFFS2_NUM_BANKS 1 diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 146d25493aa..49abcc6204d 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -195,13 +195,13 @@ #define CFG_FLASH_WORD_SIZE unsigned char #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- @@ -211,9 +211,9 @@ #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /* diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 17178e9f02e..dca7b477c67 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -178,8 +178,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/canmb.h b/include/configs/canmb.h index f0818b77dd8..59e4cb397c5 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -138,9 +138,9 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET (2*128*1024) -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE (128*1024) +#define CONFIG_ENV_OFFSET (2*128*1024) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE (128*1024) /* * Memory map diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 9ec49c10c7d..2f162e1f1a8 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -117,7 +117,7 @@ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ #define CFG_NAND_CS 0 /* NAND chip connected to CSx */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /* @@ -179,9 +179,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/canyonlands/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- @@ -202,13 +202,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h index fb737d50cce..96184257b42 100644 --- a/include/configs/cerf250.h +++ b/include/configs/cerf250.h @@ -44,7 +44,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -218,8 +218,8 @@ #define CFG_MONITOR_LEN 0x40000 /* 256 KiB */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h index 85f45b7e06e..c9c057c6388 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -42,7 +42,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -131,6 +131,6 @@ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ #endif /* __CONFIG_H */ diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h index f34dc5c9724..940e3e11bc4 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -42,7 +42,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -131,6 +131,6 @@ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ #endif /* __CONFIG_H */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 5f0d3fbcc95..5257db328ae 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -265,12 +265,12 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) /* Configuration of redundant environment */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Pin multiplexing configuration diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index d9c1263326a..9b744384ac7 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -76,7 +76,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 9600 @@ -173,9 +173,9 @@ #define CFG_FLASH_WRITE_TOUT ( 2 * CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */ -#define CFG_ENV_SECT_SIZE (64 << 10) /* sectors are 64 kB */ -#define CFG_ENV_SIZE (16 << 10) /* Use only 16 kB */ +#define CONFIG_ENV_OFFSET 0x20000 /* after u-boot.bin */ +#define CONFIG_ENV_SECT_SIZE (64 << 10) /* sectors are 64 kB */ +#define CONFIG_ENV_SIZE (16 << 10) /* Use only 16 kB */ #define CFG_LOAD_ADDR 0x21000000 /* default load address */ diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index ed6578a10ae..19c28364bce 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -171,8 +171,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00020000 /* Environment starts at this adress */ -#define CFG_ENV_SIZE 0x00010000 /* Set whole sector as env */ +#define CONFIG_ENV_OFFSET 0x00020000 /* Environment starts at this adress */ +#define CONFIG_ENV_SIZE 0x00010000 /* Set whole sector as env */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ #endif diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index c908d5aa3d5..9b729acf8ed 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -124,13 +124,13 @@ */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_IS_EMBEDDED 1 +#define CONFIG_ENV_IS_EMBEDDED 1 #else -#define CFG_ENV_ADDR 0xffe04000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xffe04000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index fff35f98ecf..b39f4cb86dc 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -258,12 +258,12 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ +#define CONFIG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ #ifdef CONFIG_CMA302 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE (512*1024) /* see README - env sect real size */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE (512*1024) /* see README - env sect real size */ #else -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index 9d257d29d1b..c77f9a25cce 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -204,12 +204,12 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ +#define CONFIG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ #ifdef CONFIG_CMA302 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE (512*1024) /* see README - env sect real size */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE (512*1024) /* see README - env sect real size */ #else -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index cbc5b2ea67b..1f53ddcf94d 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -205,7 +205,7 @@ #define CFG_FLASH_BASE 0xFE000000 #define CFG_FLASH_SIZE 0x02000000 #define CFG_FLASH_INCREMENT 0x01000000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) #define CFG_MAX_FLASH_BANKS 2 /* max num of memory banks */ #define CFG_MAX_FLASH_SECT 128 @@ -220,13 +220,13 @@ */ #if 1 /* test-only */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 #else #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */ /* total size of a CAT24WC32 is 8192 bytes */ #define CONFIG_ENV_OVERWRITE 1 #endif diff --git a/include/configs/cradle.h b/include/configs/cradle.h index ee319a7af7e..34a265d5d7a 100644 --- a/include/configs/cradle.h +++ b/include/configs/cradle.h @@ -40,7 +40,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -153,8 +153,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x00020000 /* absolute address for now */ -#define CFG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */ +#define CONFIG_ENV_ADDR 0x00020000 /* absolute address for now */ +#define CONFIG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */ /****************************************************************************** * diff --git a/include/configs/csb226.h b/include/configs/csb226.h index c5d65e57965..266e0e6533c 100644 --- a/include/configs/csb226.h +++ b/include/configs/csb226.h @@ -489,8 +489,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 1d6a0775bbb..13892e6c135 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -253,10 +253,10 @@ #endif #if defined(CONFIG_ENV_IS_IN_FLASH) -#define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ -#define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ -#define CFG_ENV_SIZE 0x00001000 /* Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */ +#define CONFIG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ +#define CONFIG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00001000 /* Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */ #endif /* diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 62bcc2ff1cd..06449827166 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -252,10 +252,10 @@ #endif #if defined(CONFIG_ENV_IS_IN_FLASH) -#define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ -#define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ -#define CFG_ENV_SIZE 0x00001000 /* Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */ +#define CONFIG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ +#define CONFIG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00001000 /* Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */ #endif /* diff --git a/include/configs/csb637.h b/include/configs/csb637.h index c3054d3709b..0760084fb24 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -76,7 +76,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -194,13 +194,13 @@ #undef CONFIG_ENV_IS_IN_DATAFLASH #ifdef CONFIG_ENV_IS_IN_DATAFLASH -#define CFG_ENV_OFFSET 0x20000 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x2000 /* 0x8000 */ +#define CONFIG_ENV_OFFSET 0x20000 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ #else #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */ -#define CFG_ENV_SIZE 0x20000 /* sectors are 128K here */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */ +#define CONFIG_ENV_SIZE 0x20000 /* sectors are 128K here */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */ diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 13f5e01a002..ae2f6a5a34c 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -116,11 +116,11 @@ #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #ifdef CFG_NAND_SMALLPAGE -#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */ -#define CFG_ENV_SIZE SZ_16K +#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_16K #else -#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ -#define CFG_ENV_SIZE SZ_128K +#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_128K #endif #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ @@ -128,7 +128,7 @@ #define CFG_NAND_HW_ECC #define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define NAND_MAX_CHIPS 1 -#define CFG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define DEF_BOOTM "" #elif defined(CFG_USE_NOR) #ifdef CONFIG_NOR_UART_BOOT @@ -144,12 +144,12 @@ #define CFG_FLASH_CFI #define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */ #define CFG_FLASH_SECT_SZ 0x10000 /* 64KB sect size AMD Flash */ -#define CFG_ENV_OFFSET (CFG_FLASH_SECT_SZ*3) +#define CONFIG_ENV_OFFSET (CFG_FLASH_SECT_SZ*3) #define PHYS_FLASH_1 0x02000000 /* CS2 Base address */ #define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */ #define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */ #define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ) -#define CFG_ENV_SECT_SIZE CFG_FLASH_SECT_SZ /* Env sector Size */ +#define CONFIG_ENV_SECT_SIZE CFG_FLASH_SECT_SZ /* Env sector Size */ #endif /*==============================*/ /* U-Boot general configuration */ diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index f6234ec3d0b..016a8970d9e 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -82,15 +82,15 @@ #undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ -#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ -#define CFG_ENV_SIZE SZ_128K +#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_128K #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CFG_NAND_BASE 0x02000000 #define CFG_NAND_HW_ECC #define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define NAND_MAX_CHIPS 1 -#define CFG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ /*=====================*/ /* Board related stuff */ /*=====================*/ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index b4f4b116820..39fb2a56035 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -78,15 +78,15 @@ #undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ -#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ -#define CFG_ENV_SIZE SZ_128K +#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_128K #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CFG_NAND_BASE 0x02000000 #define CFG_NAND_HW_ECC #define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define NAND_MAX_CHIPS 1 -#define CFG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ /* I2C switch definitions for PCA9543 chip */ #define CFG_I2C_PCA9543_ADDR 0x70 #define CFG_I2C_PCA9543_ADDR_LEN 0 /* Single register. */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index cd781eda05e..bb42a545852 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -115,15 +115,15 @@ #undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ -#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */ -#define CFG_ENV_SIZE SZ_16K +#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_16K #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CFG_NAND_BASE 0x02000000 #define CFG_NAND_HW_ECC #define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define NAND_MAX_CHIPS 1 -#define CFG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define DEF_BOOTM "" #elif defined(CFG_USE_NOR) #ifdef CONFIG_NOR_UART_BOOT @@ -139,12 +139,12 @@ #define CFG_FLASH_CFI #define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */ #define CFG_FLASH_SECT_SZ 0x20000 /* 128KB sect size AMD Flash */ -#define CFG_ENV_OFFSET (CFG_FLASH_SECT_SZ*2) +#define CONFIG_ENV_OFFSET (CFG_FLASH_SECT_SZ*2) #define PHYS_FLASH_1 0x02000000 /* CS2 Base address */ #define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */ #define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */ #define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ) -#define CFG_ENV_SECT_SIZE CFG_FLASH_SECT_SZ /* Env sector Size */ +#define CONFIG_ENV_SECT_SIZE CFG_FLASH_SECT_SZ /* Env sector Size */ #endif /*==============================*/ /* U-Boot general configuration */ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index d422cce202d..d7e48d0bc1f 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -201,8 +201,8 @@ #define CONFIG_ENV_IS_NOWHERE 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xB0030000 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xB0030000 +#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_FLASH_16BIT diff --git a/include/configs/debris.h b/include/configs/debris.h index 68c9e549b11..3ea4fa68859 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -254,9 +254,9 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 #define CONFIG_ENV_OVERWRITE 1 #define CFG_NVRAM_ACCESS_ROUTINE 1 -#define CFG_ENV_ADDR 0xFF000000 /* right at the start of NVRAM */ -#define CFG_ENV_SIZE 0x400 /* Size of the Environment - 8K */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_ADDR 0xFF000000 /* right at the start of NVRAM */ +#define CONFIG_ENV_SIZE 0x400 /* Size of the Environment - 8K */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ #define CFG_NVRAM_BASE_ADDR 0xff000000 diff --git a/include/configs/delta.h b/include/configs/delta.h index 5a5240eb631..4b75e158bd9 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -43,7 +43,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -263,8 +263,8 @@ #define CFG_NO_FLASH 1 #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x40000 -#define CFG_ENV_OFFSET_REDUND 0x44000 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_OFFSET 0x40000 +#define CONFIG_ENV_OFFSET_REDUND 0x44000 +#define CONFIG_ENV_SIZE 0x4000 #endif /* __CONFIG_H */ diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h index 4adfeed082a..2249fc8dd0d 100644 --- a/include/configs/dnp1110.h +++ b/include/configs/dnp1110.h @@ -46,7 +46,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -156,7 +156,7 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index deb20aab9b7..ecf4c5e0b90 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -136,10 +136,10 @@ #endif #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x20000 /* Size of one Flash sector */ -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Use one Flash sector for enviroment */ -#define CFG_ENV_ADDR 0xFFFC0000 -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Size of one Flash sector */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Use one Flash sector for enviroment */ +#define CONFIG_ENV_ADDR 0xFFFC0000 +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 2a3595aa570..3affdd2f668 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -98,9 +98,9 @@ #define CONFIG_RTC_DS174x 1 /* DS1743 RTC */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_NVRAM */ /*----------------------------------------------------------------------- @@ -119,13 +119,13 @@ #define CFG_FLASH_WORD_SIZE unsigned char #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h index 367e667a101..60c87bdce83 100644 --- a/include/configs/ep7312.h +++ b/include/configs/ep7312.h @@ -41,7 +41,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -150,8 +150,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ /* * JFFS2 partitions diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index 54484ad433b..d8f1aaf1c45 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -217,8 +217,8 @@ #define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_DEFAULT_IMMR 0x00010000 diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 0911f8c9259..9a602c3afb9 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -252,7 +252,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT +#define CONFIG_ENV_IN_OWN_SECT /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -476,18 +476,18 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -# define CFG_ENV_SECT_SIZE 0x40000 +# ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +# define CONFIG_ENV_SECT_SIZE 0x40000 # else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -# define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ -# endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ +# endif /* CONFIG_ENV_IN_OWN_SECT */ #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ /*----------------------------------------------------------------------- diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index 17c84963c36..a5019001baa 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -144,7 +144,7 @@ #define CONFIG_GATEWAYIP 10.0.0.1 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#define CFG_ENV_IN_OWN_SECT 1 +#define CONFIG_ENV_IN_OWN_SECT 1 #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET" @@ -208,8 +208,8 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector in flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- @@ -224,8 +224,8 @@ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_SIZE 0x200 /* Size of Environment vars */ -#define CFG_ENV_OFFSET 0x0 +#define CONFIG_ENV_SIZE 0x200 /* Size of Environment vars */ +#define CONFIG_ENV_OFFSET 0x0 #endif /* CONFIG_ENV_IS_IN_EEPROM */ /* RTC Configuration */ diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h index 35a020bd6d6..63ca2a5cb4e 100644 --- a/include/configs/evb4510.h +++ b/include/configs/evb4510.h @@ -51,7 +51,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* @@ -174,8 +174,8 @@ #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */ -#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* max size for environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* max size for environment */ #endif /* __CONFIG_H */ diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index ce19b1f8208..e445a135bf5 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -175,8 +175,8 @@ #define CFG_SDRAM_BASE EBI_SDRAM_BASE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index 31e99f3bec1..5863f83395a 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -57,7 +57,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */ @@ -179,7 +179,7 @@ #endif #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE PHYS_FLASH_SECT_SIZE #endif /* __CONFIG_H */ diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index e363d9a078b..5a7a580b095 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -220,10 +220,10 @@ */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ #define CONFIG_ENV_IS_IN_FLASH 1 -/* CFG_ENV_ADDR need to be at sector boundary */ -#define CFG_ENV_SIZE 0x8000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE) +/* CONFIG_ENV_ADDR need to be at sector boundary */ +#define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 7f8367436ca..3133c0d2b8c 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -208,10 +208,10 @@ */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ #define CONFIG_ENV_IS_IN_FLASH 1 -/* CFG_ENV_ADDR need to be at sector boundary */ -#define CFG_ENV_SIZE 0x8000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE) +/* CONFIG_ENV_ADDR need to be at sector boundary */ +#define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index a6e34d0cc16..316b003c59e 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -184,10 +184,10 @@ */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ #define CONFIG_ENV_IS_IN_FLASH 1 -/* CFG_ENV_ADDR need to be at sector boundary */ -#define CFG_ENV_SIZE 0x8000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE) +/* CONFIG_ENV_ADDR need to be at sector boundary */ +#define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 2a8226a8de6..a5ef6e1d4cb 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -181,9 +181,9 @@ #define CFG_NO_FLASH 1 #define CFG_FLASH_BASE 0x00000000 #define CFG_FLASH_SIZE 0x00800000 -#define CFG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SIZE 0x8000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE) #define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */ #define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */ @@ -211,8 +211,8 @@ */ #define CONFIG_ENV_IS_NOWHERE 1 /*#define CONFIG_ENV_IS_IN_FLASH*/ -/*#define CFG_ENV_SIZE 0x8000*/ -#define CFG_ENV_SECT_SIZE 0x40000 +/*#define CONFIG_ENV_SIZE 0x8000*/ +#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 3cfeb204050..a88ddb3d6f5 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -178,9 +178,9 @@ #define CFG_NO_FLASH 1 #define CFG_FLASH_BASE 0x00000000 #define CFG_FLASH_SIZE 0x00800000 -#define CFG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SIZE 0x8000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE) #define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */ #define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */ @@ -208,8 +208,8 @@ */ #define CONFIG_ENV_IS_NOWHERE 1 /*#define CONFIG_ENV_IS_IN_FLASH*/ -/*#define CFG_ENV_SIZE 0x8000*/ -#define CFG_ENV_SECT_SIZE 0x40000 +/*#define CONFIG_ENV_SIZE 0x8000*/ +#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/gth2.h b/include/configs/gth2.h index ad8bb595804..aaf1e4ac550 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -156,8 +156,8 @@ #define CONFIG_ENV_IS_NOWHERE 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xB0030000 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xB0030000 +#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_FLASH_16BIT diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index 19641b7df5e..e187764e2e5 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -139,7 +139,7 @@ * Monitor Stack Buffer (0x80) * 0x00F5 FFB0 Board Info Data * 0x00F6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 256k + * : CONFIG_ENV_SECT_SIZE, 256k * : CFG_MALLOC_LEN, 128k * 0x00FC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -162,7 +162,7 @@ * Monitor Stack Buffer (0x80) * 0x03F5 FFB0 Board Info Data * 0x03F6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 256k + * : CONFIG_ENV_SECT_SIZE, 256k * : CFG_MALLOC_LEN, 128k * 0x03FC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -258,7 +258,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT +#define CONFIG_ENV_IN_OWN_SECT /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -374,7 +374,7 @@ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ - + CFG_ENV_SECT_SIZE \ + + CONFIG_ENV_SECT_SIZE \ + CFG_STACK_USAGE ) #define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \ @@ -465,14 +465,14 @@ #define CONFIG_ENV_IS_IN_FLASH 1 -#ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024)) -# define CFG_ENV_SECT_SIZE (256 * 1024) +#ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024)) +# define CONFIG_ENV_SECT_SIZE (256 * 1024) #else -# define CFG_ENV_SIZE (16 * 1024)/* Size of Environment Sector */ -# define CFG_ENV_ADD ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CFG_ENV_SIZE) -# define CFG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size */ -#endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_SIZE (16 * 1024)/* Size of Environment Sector */ +# define CONFIG_ENV_ADD ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CONFIG_ENV_SIZE) +# define CONFIG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size */ +#endif /* CONFIG_ENV_IN_OWN_SECT */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 68bd4c8fa8b..5426c7a4ede 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -144,8 +144,8 @@ #define CFG_SDRAM_BASE 0x10000000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index b98883edbe6..b51ea4ea31c 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -128,19 +128,19 @@ #ifdef CONFIG_ENV_IS_IN_EEPROM /* Put the environment after the SDRAM configuration */ #define PROM_SIZE 2048 -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (PROM_SIZE-CONFIG_ENV_OFFSET) #endif #ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index 91c5f22b549..1874ff238f3 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -115,19 +115,19 @@ /* Put the environment after the SDRAM and bootstrap configuration */ #define PROM_SIZE 2048 #define CFG_BOOSTRAP_OPTION_OFFSET 512 -#define CFG_ENV_OFFSET (CFG_BOOSTRAP_OPTION_OFFSET + 0x10) -#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET (CFG_BOOSTRAP_OPTION_OFFSET + 0x10) +#define CONFIG_ENV_SIZE (PROM_SIZE-CONFIG_ENV_OFFSET) #endif #ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif diff --git a/include/configs/hermes.h b/include/configs/hermes.h index 1ecb4b5ef4c..e1a0846d48c 100644 --- a/include/configs/hermes.h +++ b/include/configs/hermes.h @@ -156,8 +156,8 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x4000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x4000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration */ diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 4d557611469..e816b6d64cc 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -149,7 +149,7 @@ #define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */ #define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */ -#define CFG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ +#define CONFIG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ #define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ @@ -164,10 +164,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/hymod.h b/include/configs/hymod.h index fd0bab1643b..9c704c651da 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -404,9 +404,9 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /*----------------------------------------------------------------------- diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 43453b7cfca..a1f1517dfb7 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -115,13 +115,13 @@ * Configuration for environment, which occupies third sector in flash. */ #ifndef CONFIG_MONITOR_IS_IN_RAM -#define CFG_ENV_ADDR 0xff820000 -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0xff820000 +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH #else /* CONFIG_MONITOR_IS_IN_RAM */ -#define CFG_ENV_OFFSET 0x4000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_IS_IN_FLASH #endif /* !CONFIG_MONITOR_IS_IN_RAM */ diff --git a/include/configs/impa7.h b/include/configs/impa7.h index 7eb6921b55e..52eb8881116 100644 --- a/include/configs/impa7.h +++ b/include/configs/impa7.h @@ -41,7 +41,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -152,8 +152,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* * JFFS2 partitions diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 1660b0509e9..b6981366b06 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -53,7 +53,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -149,10 +149,10 @@ #define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip */ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x001f0000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x001f0000) #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE (64 * 1024) -#define CFG_ENV_SIZE (64 * 1024) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SIZE (64 * 1024) /*----------------------------------------------------------------------- * CFI FLASH driver setup diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 18ff450f0c9..bf2a8dd4bbc 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -51,7 +51,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -153,8 +153,8 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0x00 /* environment starts here */ -#define CFG_ENV_SIZE 4096 +#define CONFIG_ENV_OFFSET 0x00 /* environment starts here */ +#define CONFIG_ENV_SIZE 4096 #define CFG_I2C_EEPROM_ADDR 0x52 #define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* between stop and start */ diff --git a/include/configs/incaip.h b/include/configs/incaip.h index 3d98974a2a4..5368ac8e5e1 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -153,8 +153,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xB0030000 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xB0030000 +#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_FLASH_16BIT diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 528f2762a58..32d48719d2b 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -172,9 +172,9 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) -#define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 #define CONFIG_ENV_OVERWRITE 1 #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/innokom.h b/include/configs/innokom.h index 1435d049cef..f9535c9840d 100644 --- a/include/configs/innokom.h +++ b/include/configs/innokom.h @@ -142,8 +142,8 @@ #define CONFIG_ENV_IS_IN_EEPROM 1 -#define CFG_ENV_OFFSET 0x00 /* environment starts here */ -#define CFG_ENV_SIZE 1024 /* 1 KiB */ +#define CONFIG_ENV_OFFSET 0x00 /* environment starts here */ +#define CONFIG_ENV_SIZE 1024 /* 1 KiB */ #define CFG_I2C_EEPROM_ADDR 0x50 /* A0 = 0 (hardwired) */ #define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15 /* between stop and start */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index dd070be13b5..f951a016d23 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -52,7 +52,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -135,7 +135,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CFG_MAX_FLASH_SECT 128 -#define CFG_ENV_SIZE 32768 +#define CONFIG_ENV_SIZE 32768 #define PHYS_FLASH_1 (CFG_FLASH_BASE) diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index d66ec3a194f..6dbe4b307ce 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -47,7 +47,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -169,29 +169,29 @@ SIB at Block62 End Block62 address 0x24f80000 * Move up the U-Boot & monitor area if more flash is fitted. * If this U-Boot is to be run on Integrators with varying flash sizes, * drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG - * register and dynamically assign CFG_ENV_ADDR & CFG_MONITOR_BASE + * register and dynamically assign CONFIG_ENV_ADDR & CFG_MONITOR_BASE * - CFG_MONITOR_BASE is set to indicate that the environment is not * embedded in the boot monitor(s) area */ #if ( PHYS_FLASH_SIZE == 0x04000000 ) -#define CFG_ENV_ADDR 0x27F00000 +#define CONFIG_ENV_ADDR 0x27F00000 #define CFG_MONITOR_BASE 0x27F40000 #elif (PHYS_FLASH_SIZE == 0x02000000 ) -#define CFG_ENV_ADDR 0x25F00000 +#define CONFIG_ENV_ADDR 0x25F00000 #define CFG_MONITOR_BASE 0x25F40000 #else -#define CFG_ENV_ADDR 0x24F00000 +#define CONFIG_ENV_ADDR 0x24F00000 #define CFG_MONITOR_BASE 0x27F40000 #endif -#define CFG_ENV_SECT_SIZE 0x40000 /* 256KB */ -#define CFG_ENV_SIZE 8192 /* 8KB */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ +#define CONFIG_ENV_SIZE 8192 /* 8KB */ /*----------------------------------------------------------------------- * CP control registers */ diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h index 6559429f82f..b9334759fe3 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -45,7 +45,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* allow to overwrite serial and ethaddr */ @@ -193,8 +193,8 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h index 484c2d98aa9..241728da490 100644 --- a/include/configs/ixdpg425.h +++ b/include/configs/ixdpg425.h @@ -225,13 +225,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * GPIO settings diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index ce90d7f170a..5d8e3a6fb2c 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -184,7 +184,7 @@ #define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */ -#define CFG_ENV_ADDR (TEXT_BASE + 0x40000) /* third sector */ +#define CONFIG_ENV_ADDR (TEXT_BASE + 0x40000) /* third sector */ #define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ @@ -202,13 +202,13 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 1876279abd4..fac284456ab 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -219,13 +219,13 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index 8df222b88ef..3c514177ff3 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -60,7 +60,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (roundup(CFG_ENV_SIZE,4096) + 128*1024) +#define CFG_MALLOC_LEN (roundup(CONFIG_ENV_SIZE,4096) + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -131,11 +131,11 @@ #define CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_KB9202 -#define CFG_ENV_OFFSET 0x3E00 -#define CFG_ENV_SIZE 0x0200 +#define CONFIG_ENV_OFFSET 0x3E00 +#define CONFIG_ENV_SIZE 0x0200 #else -#define CFG_ENV_OFFSET 0x1000 -#define CFG_ENV_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x1000 +#define CONFIG_ENV_SIZE 0x1000 #endif #define CFG_I2C_EEPROM_ADDR 0x50 #define CFG_EEPROM_PAGE_WRITE_BITS 6 diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index fec22d89a45..58918d49186 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -124,7 +124,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /*----------------------------------------------------------------------- @@ -144,13 +144,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /* @@ -205,9 +205,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/sequoia/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/korat.h b/include/configs/korat.h index b6984da2ca0..214cb429bcd 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -127,13 +127,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_FLASH1_TOP - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_FLASH1_TOP - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* * DDR SDRAM diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 7d903aa13c7..098b92b4749 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -160,9 +160,9 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 #define CONFIG_ENV_OVERWRITE 1 #define CFG_NVRAM_ACCESS_ROUTINE -#define CFG_ENV_ADDR CFG_NVRAM_BASE_ADDR -#define CFG_ENV_SIZE 0x400 -#define CFG_ENV_OFFSET 0 +#define CONFIG_ENV_ADDR CFG_NVRAM_BASE_ADDR +#define CONFIG_ENV_SIZE 0x400 +#define CONFIG_ENV_OFFSET 0 #define CFG_NS16550 #define CFG_NS16550_SERIAL diff --git a/include/configs/lart.h b/include/configs/lart.h index f38e5da0d04..d7b8cfc8a28 100644 --- a/include/configs/lart.h +++ b/include/configs/lart.h @@ -39,7 +39,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -153,7 +153,7 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 01ae31769f6..be2f71cb727 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -456,9 +456,9 @@ * We use the last sector of this area to store the environment * which leaves max. 384 kB for the U-Boot itself */ -#define CFG_ENV_ADDR 0xFFF60000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 +#define CONFIG_ENV_ADDR 0xFFF60000 +#define CONFIG_ENV_SIZE 0x00010000 +#define CONFIG_ENV_SECT_SIZE 0x00010000 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/logodl.h b/include/configs/logodl.h index 5e51d8134ed..dcbae9795eb 100644 --- a/include/configs/logodl.h +++ b/include/configs/logodl.h @@ -289,7 +289,7 @@ /* FIXME */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index 2f2a3e823af..3d173d71fe2 100644 --- a/include/configs/lpc2292sodimm.h +++ b/include/configs/lpc2292sodimm.h @@ -49,7 +49,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -151,8 +151,8 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (0x0 + 0x3C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (0x0 + 0x3C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h index ae9503fd9f6..9e6ea1a286e 100644 --- a/include/configs/lpd7a400.h +++ b/include/configs/lpd7a400.h @@ -37,7 +37,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -113,7 +113,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) -#define CFG_ENV_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) +#define CONFIG_ENV_SIZE 0x40000 #endif /* __LPD7A400_H_ */ diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h index 7ea4342a1be..9c959134119 100644 --- a/include/configs/lpd7a404.h +++ b/include/configs/lpd7a404.h @@ -37,7 +37,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -113,7 +113,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) -#define CFG_ENV_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) +#define CONFIG_ENV_SIZE 0x40000 #endif /* __LPD7A404_H_ */ diff --git a/include/configs/luan.h b/include/configs/luan.h index 9aef77cc5af..2259ec34de0 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -115,13 +115,13 @@ #define CFG_FLASH_WORD_SIZE unsigned char #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 7e0c4a20cfb..3c921c0c924 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -49,7 +49,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -232,9 +232,9 @@ */ #define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE -#define CFG_ENV_SIZE (PHYS_FLASH_SECT_SIZE / 16) +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_SIZE (PHYS_FLASH_SECT_SIZE / 16) /* diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 73b988f29b6..e4ee099fa85 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -316,9 +316,9 @@ /* Put environment in flash which is much faster to boot than using the EEPROM */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x40040000 /* Address of Environment Sector */ -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x40000 /* we have BIG sectors only :-( */ +#define CONFIG_ENV_ADDR 0x40040000 /* Address of Environment Sector */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* we have BIG sectors only :-( */ /*----------------------------------------------------------------------- * I2C/EEPROM Configuration diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 841361541a8..c09e301ce05 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -142,13 +142,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h index bbc2b4e3ebd..32403f7de6e 100644 --- a/include/configs/m501sk.h +++ b/include/configs/m501sk.h @@ -45,7 +45,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* Bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -58,7 +58,7 @@ */ #define CFG_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #define CFG_FLASH_USE_BUFFER_WRITE #define CFG_FLASH_PROTECTION /*for Intel P30 Flash*/ #define CONFIG_HARD_I2C @@ -155,18 +155,18 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #ifdef CONFIG_ENV_IS_IN_DATAFLASH -#define CFG_ENV_OFFSET 0x20000 -#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x20000 +#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x00020000) -#define CFG_ENV_SIZE 2048 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x00020000) +#define CONFIG_ENV_SIZE 2048 #endif #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_OFFSET 1024 -#define CFG_ENV_SIZE 1024 +#define CONFIG_ENV_OFFSET 1024 +#define CONFIG_ENV_SIZE 1024 #endif #define CFG_LOAD_ADDR 0x21000000 /* default load address */ diff --git a/include/configs/makalu.h b/include/configs/makalu.h index 97715a32928..b7dddb70ea3 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -138,13 +138,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 4e8c0d11055..c3a600e6776 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -229,13 +229,13 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */ diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h index 67c848510ec..9a83f083a8a 100644 --- a/include/configs/mcu25.h +++ b/include/configs/mcu25.h @@ -128,19 +128,19 @@ #ifdef CONFIG_ENV_IS_IN_EEPROM /* Put the environment after the SDRAM configuration */ #define PROM_SIZE 2048 -#define CFG_ENV_OFFSET 512 -#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 512 +#define CONFIG_ENV_SIZE (PROM_SIZE-CONFIG_ENV_OFFSET) #endif #ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 8*1024 /* 8 KB Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index e0bd6e3e05e..8b13fc0acb4 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -180,7 +180,7 @@ */ #define CFG_FLASH_BASE 0xFFC00000 #define CFG_FLASH_SIZE 0x00400000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x003E0000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x003E0000) #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */ #define CFG_MAX_FLASH_SECT 512 @@ -192,13 +192,13 @@ */ #if 1 /* test-only */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_OVERWRITE 1 #else #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars*/ +#define CONFIG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars*/ /* total size of a CAT24WC32 is 8192 bytes */ #define CONFIG_ENV_OVERWRITE 1 #endif diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 015e4dc527e..23af3ec4834 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -172,8 +172,8 @@ #define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_IMMR 0xF0000000 diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 7fd5a47f337..740767e1e2f 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -197,13 +197,13 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 69e99a6db43..da307aca2d8 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -150,8 +150,8 @@ #define CFG_FRAM_SIZE 0x20000 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 65536 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 65536 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE) #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) diff --git a/include/configs/ml300.h b/include/configs/ml300.h index 67129a55add..8d482216dd6 100644 --- a/include/configs/ml300.h +++ b/include/configs/ml300.h @@ -68,7 +68,7 @@ #ifdef CONFIG_ENV_IS_IN_EEPROM #define CFG_I2C_EEPROM_ADDR XPAR_PERSISTENT_0_IIC_0_EEPROMADDR #define CFG_I2C_EEPROM_ADDR_LEN 1 -#define CFG_ENV_OFFSET XPAR_PERSISTENT_0_IIC_0_BASEADDR +#define CONFIG_ENV_OFFSET XPAR_PERSISTENT_0_IIC_0_BASEADDR #define CONFIG_MISC_INIT_R 1 /* used to call out convert_env() */ #define CONFIG_ENV_OVERWRITE 1 /* allow users to update ethaddr and serial# */ #endif @@ -76,7 +76,7 @@ #include "../board/xilinx/ml300/xparameters.h" #define CFG_NO_FLASH 1 /* no flash */ -#define CFG_ENV_SIZE XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1 +#define CONFIG_ENV_SIZE XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1 #define CONFIG_BAUDRATE 9600 #define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ diff --git a/include/configs/ml401.h b/include/configs/ml401.h index 75fcb6a922b..2a6c68c656b 100644 --- a/include/configs/ml401.h +++ b/include/configs/ml401.h @@ -162,21 +162,21 @@ #ifdef RAMENV #define CONFIG_ENV_IS_NOWHERE 1 - #define CFG_ENV_SIZE 0x1000 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) + #define CONFIG_ENV_SIZE 0x1000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SIZE) #else /* !RAMENV */ #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ - #define CFG_ENV_ADDR (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE)) - #define CFG_ENV_SIZE 0x40000 + #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ + #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE)) + #define CONFIG_ENV_SIZE 0x40000 #endif /* !RAMBOOT */ #else /* !FLASH */ /* ENV in RAM */ #define CFG_NO_FLASH 1 #define CONFIG_ENV_IS_NOWHERE 1 - #define CFG_ENV_SIZE 0x1000 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) + #define CONFIG_ENV_SIZE 0x1000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SIZE) #define CFG_FLASH_PROTECTION /* hardware flash protection */ #endif /* !FLASH */ diff --git a/include/configs/ml507.h b/include/configs/ml507.h index e34e43a2e7b..22a972f3bcf 100644 --- a/include/configs/ml507.h +++ b/include/configs/ml507.h @@ -28,10 +28,10 @@ /*Env*/ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_OFFSET 0x340000 -#define CFG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x340000 +#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ #define CFG_PROMPT "ml507:/# " /* Monitor Command Prompt */ diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h index 7cfd4fa4ae6..8f4011a1c1a 100644 --- a/include/configs/modnet50.h +++ b/include/configs/modnet50.h @@ -45,7 +45,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* @@ -173,9 +173,9 @@ #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE -#define CFG_ENV_ADDR 0x1001C000 /* environment start address */ -#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* max size for environment */ +#define CONFIG_ENV_ADDR 0x1001C000 /* environment start address */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* max size for environment */ /* * JFFS2 partitions diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 8692ab8b8dd..73a03a8ee5d 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -355,13 +355,13 @@ extern void __led_set(led_id_t id, int state); */ #define CONFIG_ENV_IS_IN_FLASH 1 /* This has to be a multiple of the Flash sector size */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE 0x1000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Configuration of redundant environment */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Pin multiplexing configuration diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h index f0b5c9fe9f3..ba1ed0dcad4 100644 --- a/include/configs/mp2usb.h +++ b/include/configs/mp2usb.h @@ -81,7 +81,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_BAUDRATE 115200 @@ -200,9 +200,9 @@ #define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_ENV_OFFSET) -#define CFG_ENV_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x20000 /* after u-boot.bin */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x20000 #define CFG_LOAD_ADDR 0x21000000 /* default load address */ diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index 7fd06a6ec4f..308a7b94299 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -382,10 +382,10 @@ #define CFG_MAX_FLASH_SECT (128) #define CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_ADDR 0xFC000000 +#define CONFIG_ENV_ADDR 0xFC000000 -#define CFG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x00000400 /* Total Size of Environment Space */ +#define CONFIG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x00000400 /* Total Size of Environment Space */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 6e0721e9869..6b378ac7d03 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -74,9 +74,9 @@ #define CFG_MAX_FLASH_BANKS 1 #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (128 * 1024) -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 120000 #define CFG_FLASH_WRITE_TOUT 500 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index ee19b026e7d..f308460c75c 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -93,9 +93,9 @@ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (64 * 1024) -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 120000 #define CFG_FLASH_WRITE_TOUT 500 diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 55f264c323b..5f5970b54d1 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -116,12 +116,12 @@ #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 -#define CFG_ENV_SECT_SIZE (8 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE)) -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) /* Offset of env Flash sector relative to CFG_FLASH_BASE */ -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE)) +#define CONFIG_ENV_SECT_SIZE (8 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) /* Offset of env Flash sector relative to CFG_FLASH_BASE */ +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE)) /* Board Clock */ #define CONFIG_SYS_CLK_FREQ 33333333 diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index c4a1f54885a..acb4d6d32ea 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -93,9 +93,9 @@ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 120000 #define CFG_FLASH_WRITE_TOUT 500 diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index ded0f4cbeda..c6618297923 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -230,8 +230,8 @@ #define CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ /* diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h index d3546c7470f..8971f0b6c8d 100644 --- a/include/configs/mucmc52.h +++ b/include/configs/mucmc52.h @@ -160,7 +160,7 @@ #define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */ #define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */ -#define CFG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ +#define CONFIG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ #define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ @@ -175,10 +175,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/munices.h b/include/configs/munices.h index 6d39580b272..8f3071a72da 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -153,13 +153,13 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x40000 -#define CFG_ENV_ADDR (TEXT_BASE + CFG_ENV_OFFSET) -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR_REDUND (TEXT_BASE + CFG_ENV_OFFSET_REDUND) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET 0x40000 +#define CONFIG_ENV_ADDR (TEXT_BASE + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR_REDUND (TEXT_BASE + CONFIG_ENV_OFFSET_REDUND) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index bf43dad01b5..2eb43bf73d7 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -57,7 +57,7 @@ * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ @@ -172,11 +172,11 @@ #define CONFIG_SYNCFLASH 1 #define PHYS_FLASH_SIZE 0x01000000 #define CFG_MAX_FLASH_SECT (16) -#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x00ff8000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+0x00ff8000) #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x04000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x100000 +#define CONFIG_ENV_SIZE 0x04000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x100000 /*----------------------------------------------------------------------- * Enable passing ATAGS diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h index 8f4b42c757c..39950dc5411 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -98,7 +98,7 @@ /* * Malloc pool need to host env + 128 Kb reserve for other allocations. */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + (128<<10) ) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ @@ -208,8 +208,8 @@ #define CFG_MONITOR_BASE 0x10000000 #define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x10020000 /* absolute address for now */ -#define CFG_ENV_SIZE 0x20000 +#define CONFIG_ENV_ADDR 0x10020000 /* absolute address for now */ +#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 0bb0568e424..314856c4c8f 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -50,7 +50,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -168,18 +168,18 @@ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE (32 * 1024) -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE (32 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end. * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors, * if we put environment next to it, we will have to occupy 128KiB for it. * Putting it at the top of flash we use only 32KiB. */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE) /*----------------------------------------------------------------------- * CFI FLASH driver setup diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 76d025cf695..23fd18b8f18 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -76,11 +76,11 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_ADDR 0x4000 -#define CFG_ENV_SIZE (8 * 1024) -#define CFG_ENV_SECT_SIZE (8 * 1024) -#define CFG_ENV_ADDR_REDUND 0x6000 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR 0x4000 +#define CONFIG_ENV_SIZE (8 * 1024) +#define CONFIG_ENV_SECT_SIZE (8 * 1024) +#define CONFIG_ENV_ADDR_REDUND 0x6000 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_OVERWRITE /* diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index f8200f99f2f..5b5c6eb2dc2 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -49,7 +49,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial * data */ @@ -172,12 +172,12 @@ #ifdef CONFIG_AMD_LV800 #define PHYS_FLASH_SIZE 0x00100000 /* 1MB */ #define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ #endif #ifdef CONFIG_AMD_LV400 #define PHYS_FLASH_SIZE 0x00080000 /* 512KB */ #define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ #endif /* timeout values are in ticks */ @@ -187,7 +187,7 @@ /* @TODO */ /*#define CONFIG_ENV_IS_IN_FLASH 1*/ #define CONFIG_ENV_IS_NOWHERE -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #ifdef CONFIG_STATUS_LED diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index 09995e87be0..b515388b53c 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -190,7 +190,7 @@ */ #define CFG_FLASH_BASE 0xFF000000 #define CFG_FLASH_SIZE 0x01000000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */ #define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */ @@ -204,8 +204,8 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index b0a2e5d2071..6a8665e4e25 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -113,9 +113,9 @@ #define CONFIG_RTC_DS174x 1 /* DS1743 RTC */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_NVRAM */ /*----------------------------------------------------------------------- @@ -133,13 +133,13 @@ #define CFG_FLASH_WORD_SIZE unsigned char #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index fe6a0db5369..d390d856f7f 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -49,7 +49,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -170,7 +170,7 @@ #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ #define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */ #define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ #define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE } @@ -188,8 +188,8 @@ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE -#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ #endif /* __CONFIG_H */ diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h index 9d2051df3a3..aeb2fec9c20 100644 --- a/include/configs/omap1610h2.h +++ b/include/configs/omap1610h2.h @@ -51,7 +51,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -181,14 +181,14 @@ extern unsigned long omap_flash_base; /* set in flash__init */ #define PHYS_FLASH_SIZE 0x02000000 /* 32MB */ #define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */ /* addr of environment */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0x20000 /* environment starts here */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */ #endif /* __CONFIG_H */ diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h index edc42e45aee..68cf91c78af 100644 --- a/include/configs/omap1610inn.h +++ b/include/configs/omap1610inn.h @@ -50,7 +50,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -186,14 +186,14 @@ extern unsigned long omap_flash_base; /* set in flash__init */ #define PHYS_FLASH_SIZE 0x02000000 /* 32MB */ #define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */ /* addr of environment */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0x20000 /* environment starts here */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */ #endif /* __CONFIG_H */ diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index ac98fb5483d..9018440d1ac 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -70,8 +70,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -271,12 +271,12 @@ #ifdef CFG_NAND_BOOT #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x80000 /* environment starts here */ +#define CONFIG_ENV_OFFSET 0x80000 /* environment starts here */ #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K) #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE -#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE +#define CONFIG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index 0f56279e4de..dd3f7de4f62 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -53,7 +53,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -196,9 +196,9 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 /* addr of environment */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0x20000 /* environment starts here */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */ #endif /* __CONFIG_H */ diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index b781f727324..b1c4a305783 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -58,7 +58,7 @@ * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -193,14 +193,14 @@ #define PHYS_FLASH_SIZE 0x02000000 /* 32MB */ #define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */ /* addr of environment */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0x20000 /* environment starts here */ +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */ #endif /* ! __CONFIG_H */ diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 1128c4ecb4b..2df1d9d34b6 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -139,12 +139,12 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #if defined (CONFIG_P3M750) -#define CFG_ENV_SECT_SIZE 0x20000 /* one sector (1 device) */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* one sector (1 device) */ #elif defined (CONFIG_P3M7448) -#define CFG_ENV_SECT_SIZE 0x40000 /* two sectors (2 devices parallel */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* two sectors (2 devices parallel */ #endif -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 046ec254813..5cef3ea6911 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -297,13 +297,13 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * For booting Linux, the board info and command line data diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 4ec520fef38..480a59f05bb 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -119,8 +119,8 @@ #define CONFIG_ENV_IS_NOWHERE 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xB0030000 -#define CFG_ENV_SIZE 0x10000 +#define CONFIG_ENV_ADDR 0xB0030000 +#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_FLASH_16BIT diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 368a66b95dd..62f13f2959a 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -110,15 +110,15 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ #define CONFIG_ENV_OVERWRITE 1 /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ #define ENV_NAME_REVLEV "revision_level" diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h index 1a3bf1c6fe8..664a885fff6 100644 --- a/include/configs/pcu_e.h +++ b/include/configs/pcu_e.h @@ -228,17 +228,17 @@ #if 0 /* Start port with environment in flash; switch to SPI EEPROM later */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */ -#define CFG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */ -#define CFG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */ +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment */ +#define CONFIG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */ #else /* Final version: environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 #define CFG_I2C_EEPROM_ADDR 0 #define CFG_I2C_EEPROM_ADDR_LEN 2 -#define CFG_ENV_OFFSET 1024 -#define CFG_ENV_SIZE 1024 +#define CONFIG_ENV_OFFSET 1024 +#define CONFIG_ENV_SIZE 1024 #endif /*----------------------------------------------------------------------- diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index 0b7b6d4f87c..856917e7b1c 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -245,18 +245,18 @@ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) #if defined(CONFIG_SCPU) /* no redundant environment on SCPU */ -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #else -#define CFG_ENV_SECT_SIZE 0x1000 /* size of one complete sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x1000 /* size of one complete sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif #if !defined(CONFIG_SCPU) diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 6120f582904..66ad01f7eef 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -194,7 +194,7 @@ */ #define CFG_FLASH_BASE 0xFE000000 #define CFG_FLASH_SIZE 0x02000000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */ #define CFG_MAX_FLASH_SECT 512 @@ -206,13 +206,13 @@ */ #if 1 /* test-only */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_OVERWRITE 1 #else #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ -#define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ -#define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */ +#define CONFIG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */ +#define CONFIG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */ /* total size of a CAT24WC32 is 8192 bytes */ #define CONFIG_ENV_OVERWRITE 1 #endif diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h index 799cf769969..66e76e8aa52 100644 --- a/include/configs/pleb2.h +++ b/include/configs/pleb2.h @@ -45,7 +45,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -247,9 +247,9 @@ /* FIXME */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Option added to get around byte ordering issues in the flash driver */ #define CFG_LITTLE_ENDIAN 1 diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index cd5ef94579c..fd05c7ef292 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -275,17 +275,17 @@ * Environment config - see memory map details above * * CONFIG_ENV_IS_IN_FLASH - The env variables are stored in flash - * CFG_ENV_ADDR - Address of the sector containing env vars - * CFG_ENV_SIZE - Ammount of RAM for env vars (used to save RAM, 4KB) - * CFG_ENV_SECT_SIZE - Size of sector containing env vars (32KB) + * CONFIG_ENV_ADDR - Address of the sector containing env vars + * CONFIG_ENV_SIZE - Ammount of RAM for env vars (used to save RAM, 4KB) + * CONFIG_ENV_SECT_SIZE - Size of sector containing env vars (32KB) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFFE0000 -#define CFG_ENV_SIZE 0x1000 -#define CFG_ENV_ADDR_REDUND 0xFFFE8000 -#define CFG_ENV_SIZE_REDUND 0x1000 -#define CFG_ENV_SECT_SIZE 0x8000 +#define CONFIG_ENV_ADDR 0xFFFE0000 +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR_REDUND 0xFFFE8000 +#define CONFIG_ENV_SIZE_REDUND 0x1000 +#define CONFIG_ENV_SECT_SIZE 0x8000 /* diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index a045f224108..dd71862b414 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -137,7 +137,7 @@ * Monitor Stack Buffer (0x80) * 0x0FF5 FFB0 Board Info Data * 0x0FF6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 256k + * : CONFIG_ENV_SECT_SIZE, 256k * : CFG_MALLOC_LEN, 128k * 0x0FFC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -200,7 +200,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT 1 +#define CONFIG_ENV_IN_OWN_SECT 1 /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -334,7 +334,7 @@ #define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ - + CFG_ENV_SECT_SIZE \ + + CONFIG_ENV_SECT_SIZE \ + CFG_STACK_USAGE ) #define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \ @@ -463,20 +463,20 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -# define CFG_ENV_SECT_SIZE 0x40000 +# ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +# define CONFIG_ENV_SECT_SIZE 0x40000 # else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -# define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ -# endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ +# endif /* CONFIG_ENV_IN_OWN_SECT */ #else # define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) -#define CFG_ENV_SIZE 0x1000 -# define CFG_ENV_SECT_SIZE 0x40000 +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +#define CONFIG_ENV_SIZE 0x1000 +# define CONFIG_ENV_SECT_SIZE 0x40000 #endif /* CFG_RAMBOOT */ /*----------------------------------------------------------------------- diff --git a/include/configs/purple.h b/include/configs/purple.h index 59743dfed01..5cc4fc774a8 100644 --- a/include/configs/purple.h +++ b/include/configs/purple.h @@ -146,8 +146,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xB0008000 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR 0xB0008000 +#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_FLASH_32BIT #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index 9f83c7df064..1afff5e23d7 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -71,7 +71,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -350,8 +350,8 @@ /* put cfg at end of flash for now */ #define CONFIG_ENV_IS_IN_FLASH 1 /* Addr of Environment Sector */ -#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000) -#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE (PHYS_FLASH_SECT_SIZE / 16) +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000) +#define CONFIG_ENV_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE (PHYS_FLASH_SECT_SIZE / 16) #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index e03e71026a9..faaa88910bb 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -150,10 +150,10 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) /* Address and size of Primary Environment Sector */ -#define CFG_ENV_SIZE 0x8000 +#define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index ad7f290376b..3d78ac47acd 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -199,18 +199,18 @@ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ /* the environment is located before u-boot */ -#define CFG_ENV_ADDR (TEXT_BASE - CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (TEXT_BASE - CONFIG_ENV_SECT_SIZE) /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) #endif #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_SIZE 0x400 /* Size of Environment vars */ -#define CFG_ENV_OFFSET 0x00000000 +#define CONFIG_ENV_SIZE 0x400 /* Size of Environment vars */ +#define CONFIG_ENV_OFFSET 0x00000000 #define CFG_ENABLE_CRC_16 1 /* Intrinsyc formatting used crc16 */ #endif diff --git a/include/configs/quantum.h b/include/configs/quantum.h index a35418fa896..f2646152e2b 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -209,14 +209,14 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* FPGA */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 666219e3cfc..41a2a15122f 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -72,9 +72,9 @@ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x40000 -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x40000 +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) /* * SuperH Clock setting diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 7123a837094..4f3f8e53753 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -113,9 +113,9 @@ #define CFG_FLASH_EMPTY_INFO #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (256 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (256 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 120000 #define CFG_FLASH_WRITE_TOUT 500 diff --git a/include/configs/redwood.h b/include/configs/redwood.h index c825f13c26e..dac323ba7f7 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -176,9 +176,9 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR 0xfffa0000 -#define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR 0xfffa0000 +#define CONFIG_ENV_SIZE 0x10000 /* Size of Environment vars */ #endif /* CONFIG_ENV_IS_IN_FLASH */ /*---------------------------------------------------------------------------*/ diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 46f94dac701..0c0b2064628 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -189,12 +189,12 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR ((TEXT_BASE) + 0x40000) -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR ((TEXT_BASE) + 0x40000) +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Reset address diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 89db35b70e1..09913a906a6 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -292,8 +292,8 @@ #undef CONFIG_NVRAM_ENV #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH + 0x28000) /* Addr of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x8000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH + 0x28000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x8000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index f6b013c3644..d99e4f3274c 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -93,9 +93,9 @@ #define CFG_MAX_FLASH_BANKS 1 #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (64 * 1024) -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 12000 #define CFG_FLASH_WRITE_TOUT 500 diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index bce8c9c8fe8..560bf055075 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -124,7 +124,7 @@ * Monitor Stack Buffer (0x80) * 0x03F5 FFB0 Board Info Data * 0x03F6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 16k + * : CONFIG_ENV_SECT_SIZE, 16k * : CFG_MALLOC_LEN, 128k * 0x03FC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -316,7 +316,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT 1 +#define CONFIG_ENV_IN_OWN_SECT 1 /* Define this to contain any number of null terminated strings that * will be part of the default enviroment compiled into the boot image. @@ -610,7 +610,7 @@ #define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ - + CFG_ENV_SECT_SIZE \ + + CONFIG_ENV_SECT_SIZE \ + CFG_STACK_USAGE ) #define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \ @@ -709,19 +709,19 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -# define CFG_ENV_SECT_SIZE 0x10000 +# ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +# define CONFIG_ENV_SECT_SIZE 0x10000 # else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -# define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ -# endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ +# endif /* CONFIG_ENV_IN_OWN_SECT */ #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ /*----------------------------------------------------------------------- diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h index 8c14e8b62cb..110ab3904df 100644 --- a/include/configs/sbc2410x.h +++ b/include/configs/sbc2410x.h @@ -57,7 +57,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -180,13 +180,13 @@ #ifdef CONFIG_AMD_LV800 #define PHYS_FLASH_SIZE 0x00100000 /* 1MB */ #define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ #endif #ifdef CONFIG_AMD_LV400 #define PHYS_FLASH_SIZE 0x00080000 /* 512KB */ #define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ #endif /* timeout values are in ticks */ @@ -194,7 +194,7 @@ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * NAND flash settings diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 33eeca220ab..759e4e2acae 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -227,11 +227,11 @@ /*----------------------------------------------------------------------- * Environment Variable setup */ -#define CFG_ENV_ADDR CFG_FLASH_BASE /* starting right at the beginning */ +#define CONFIG_ENV_ADDR CFG_FLASH_BASE /* starting right at the beginning */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ -#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */ +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h index 6e3c160ec86..10ff7ab40ed 100644 --- a/include/configs/sbc8240.h +++ b/include/configs/sbc8240.h @@ -340,10 +340,10 @@ typedef unsigned int led_id_t; * It's stored in flash separately. */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0xFFF70000 -#define CFG_ENV_SIZE 0x4000 /* Size of the Environment */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFF70000 +#define CONFIG_ENV_SIZE 0x4000 /* Size of the Environment */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 3a031de0879..e96adb949cc 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -127,7 +127,7 @@ * Monitor Stack Buffer (0x80) * 0x00F5 FFB0 Board Info Data * 0x00F6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 256k + * : CONFIG_ENV_SECT_SIZE, 256k * : CFG_MALLOC_LEN, 128k * 0x00FC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -150,7 +150,7 @@ * Monitor Stack Buffer (0x80) * 0x03F5 FFB0 Board Info Data * 0x03F6 0000 Malloc Arena - * : CFG_ENV_SECT_SIZE, 256k + * : CONFIG_ENV_SECT_SIZE, 256k * : CFG_MALLOC_LEN, 128k * 0x03FC 0000 RAM Copy of Monitor Code * : CFG_MONITOR_LEN, 256k @@ -275,7 +275,7 @@ * put in the same sector as U-Boot, and changing variables * will erase U-Boot temporarily */ -#define CFG_ENV_IN_OWN_SECT 1 +#define CONFIG_ENV_IN_OWN_SECT 1 /* Define to allow the user to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -509,7 +509,7 @@ #define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */ #define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \ + CFG_MALLOC_LEN \ - + CFG_ENV_SECT_SIZE \ + + CONFIG_ENV_SECT_SIZE \ + CFG_STACK_USAGE ) #define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \ @@ -605,19 +605,19 @@ #ifndef CFG_RAMBOOT # define CONFIG_ENV_IS_IN_FLASH 1 -# ifdef CFG_ENV_IN_OWN_SECT -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -# define CFG_ENV_SECT_SIZE 0x40000 +# ifdef CONFIG_ENV_IN_OWN_SECT +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +# define CONFIG_ENV_SECT_SIZE 0x40000 # else -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -# define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ -# endif /* CFG_ENV_IN_OWN_SECT */ +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +# define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ +# endif /* CONFIG_ENV_IN_OWN_SECT */ #else # define CONFIG_ENV_IS_IN_NVRAM 1 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -# define CFG_ENV_SIZE 0x200 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +# define CONFIG_ENV_SIZE 0x200 #endif /* CFG_RAMBOOT */ /*----------------------------------------------------------------------- diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index fa0ccd81328..dc5a1011d94 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -414,19 +414,19 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) - #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) + #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 1f6dc3fe54c..9d436c6fbf8 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -435,9 +435,9 @@ * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 72e4791f301..38ae1b1adb7 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -333,19 +333,19 @@ #if !defined(CFG_RAMBOOT) #if defined(CONFIG_RAM_AS_FLASH) #define CONFIG_ENV_IS_NOWHERE - #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) + #define CONFIG_ENV_SIZE 0x2000 #else #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) - #define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */ + #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) + #define CONFIG_ENV_SIZE 0x2000 /* CONFIG_ENV_SECT_SIZE */ #endif #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600" diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 40211a0ac9a..01003a396e0 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -470,9 +470,9 @@ * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) -#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 1a614fd6279..88a24b87973 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -406,13 +406,13 @@ extern unsigned long offsetOfEnvironment; #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector in bottom type */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x4000 /* see README - env sector total size */ +#define CONFIG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector in bottom type */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x4000 /* see README - env sector total size */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* let us changing anything in our environment */ diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h index ecfd7491397..0042e300573 100644 --- a/include/configs/sc520_cdp.h +++ b/include/configs/sc520_cdp.h @@ -63,7 +63,7 @@ /* * Size of malloc() pool */ -#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024) +#define CONFIG_MALLOC_SIZE (CONFIG_ENV_SIZE + 128*1024) #define CONFIG_BAUDRATE 9600 @@ -146,8 +146,8 @@ /* Environment in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 #define CONFIG_SPI -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/ -#define CFG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/ +#define CONFIG_ENV_OFFSET 0 #define CONFIG_SC520_CDP_USE_SPI /* Store configuration in the SPI part */ #undef CONFIG_SC520_CDP_USE_MW /* Store configuration in the MicroWire part */ #define CONFIG_SPI_X 1 diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h index a8f520c3c2e..4e5798c8a69 100644 --- a/include/configs/sc520_spunk.h +++ b/include/configs/sc520_spunk.h @@ -59,7 +59,7 @@ /* * Size of malloc() pool */ -#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024) +#define CONFIG_MALLOC_SIZE (CONFIG_ENV_SIZE + 128*1024) #define CONFIG_BAUDRATE 9600 @@ -154,9 +154,9 @@ #if 0 /* Environment in flash */ #define CONFIG_ENV_IS_IN_FLASH 1 -# define CFG_ENV_ADDR (0x387a0000) /* Addr of Environment Sector */ -# define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector (or 0x10000) */ -# define CFG_ENV_OFFSET 0 +# define CONFIG_ENV_ADDR (0x387a0000) /* Addr of Environment Sector */ +# define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector (or 0x10000) */ +# define CONFIG_ENV_OFFSET 0 #else /* Environment in EEPROM */ @@ -164,8 +164,8 @@ # define CONFIG_ENV_IS_IN_EEPROM 1 # define CONFIG_SPI # define CONFIG_SPI_X 1 -# define CFG_ENV_SIZE 0x2000 /* Total Size of Environment EEPROM */ -# define CFG_ENV_OFFSET 0x1c00 +# define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment EEPROM */ +# define CONFIG_ENV_OFFSET 0x1c00 #endif diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 51826d73562..12799559fb8 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -105,7 +105,7 @@ /* * Malloc pool need to host env + 128 Kb reserve for other allocations. */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + (128<<10) ) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ @@ -216,8 +216,8 @@ #define CFG_MONITOR_BASE 0x10000000 #define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x10020000 /* absolute address for now */ -#define CFG_ENV_SIZE 0x20000 +#define CONFIG_ENV_ADDR 0x10020000 /* absolute address for now */ +#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 3574a6f5f88..d39a894d2a3 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -116,7 +116,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */ -#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /* @@ -140,13 +140,13 @@ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* @@ -202,9 +202,9 @@ * For NAND booting the environment is embedded in the U-Boot image. Please take * look at the file board/amcc/sequoia/u-boot-nand.lds for details. */ -#define CFG_ENV_SIZE CFG_NAND_BLOCK_SIZE -#define CFG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE) -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE CFG_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #endif /* diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 05e3f962497..2daaeb0459d 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -104,13 +104,13 @@ #undef CFG_FLASH_PROTECTION #undef CFG_DIRECT_FLASH_TFTP #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (128 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE)) +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) /* Offset of env Flash sector relative to CFG_FLASH_BASE */ -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE)) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE)) /* Clock */ #define CONFIG_SYS_CLK_FREQ 66666666 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index f9bbb4d0b10..bf06f62ba07 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -152,11 +152,11 @@ /* ENV setting */ #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 -#define CFG_ENV_SECT_SIZE (256 * 1024) -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE) +#define CONFIG_ENV_SECT_SIZE (256 * 1024) +#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) /* Board Clock */ /* The SCIF used external clock. system clock only used timer. */ diff --git a/include/configs/shannon.h b/include/configs/shannon.h index 28fecf1fc92..edc9a2ef126 100644 --- a/include/configs/shannon.h +++ b/include/configs/shannon.h @@ -48,7 +48,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -161,11 +161,11 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_INFERNO /* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */ -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #else -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h index 35eebeb0c6b..15ae3da1265 100644 --- a/include/configs/smdk2400.h +++ b/include/configs/smdk2400.h @@ -50,7 +50,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -181,11 +181,11 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) -#define CFG_ENV_SIZE 0x40000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +#define CONFIG_ENV_SIZE 0x40000 /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* __CONFIG_H */ diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 86ebcbaf014..cd0093ef717 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -47,7 +47,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -166,12 +166,12 @@ #ifdef CONFIG_AMD_LV800 #define PHYS_FLASH_SIZE 0x00100000 /* 1MB */ #define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */ #endif #ifdef CONFIG_AMD_LV400 #define PHYS_FLASH_SIZE 0x00080000 /* 512KB */ #define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x070000) /* addr of environment */ #endif /* timeout values are in ticks */ @@ -179,6 +179,6 @@ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 4c5602bf8ad..ea65c0ef1e1 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -68,7 +68,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 1024 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes for initial data */ /* @@ -196,7 +196,7 @@ #define CFG_FLASH_ERASE_TOUT (5 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (5 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* * SMDK6400 board specific data @@ -222,7 +222,7 @@ /* NAND U-Boot load and start address */ #define CFG_UBOOT_BASE (CFG_MAPPED_RAM_BASE + 0x07e00000) -#define CFG_ENV_OFFSET 0x0040000 +#define CONFIG_ENV_OFFSET 0x0040000 /* NAND configuration */ #define CFG_MAX_NAND_DEVICE 1 diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index cf92fa77f3a..fd13dcd4455 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -204,9 +204,9 @@ #undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */ #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) #else /* CFG_LOWBOOT */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ @@ -227,10 +227,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 09e1c8cfc5f..867eb3513cd 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -309,11 +309,11 @@ * Environment */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index fef722be839..4bc4afba5fa 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -198,11 +198,11 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x8000000 - 0x40000) -#define CFG_ENV_SIZE 0x4000 /* 16K */ -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + 0x20000) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x8000000 - 0x40000) +#define CONFIG_ENV_SIZE 0x4000 /* 16K */ +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + 0x20000) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 73fa97f14a6..592cef19f02 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -186,8 +186,8 @@ /* Environment is in flash */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/spieval.h b/include/configs/spieval.h index 8df56e393a8..ab1c6f4e75e 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -295,9 +295,9 @@ #undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */ #if !defined(CFG_LOWBOOT) -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000) #else /* CFG_LOWBOOT */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) #endif /* CFG_LOWBOOT */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ @@ -309,10 +309,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index 95230ac17c7..e06256d78b7 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -289,14 +289,14 @@ */ #ifndef CFG_RAMBOOT #define CONFIG_ENV_IS_IN_FLASH 1 - #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) - #define CFG_ENV_SECT_SIZE 0x4000 /* 16K (one top sector) for env */ - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) + #define CONFIG_ENV_SECT_SIZE 0x4000 /* 16K (one top sector) for env */ + #define CONFIG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ - #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) - #define CFG_ENV_SIZE 0x2000 + #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=any console=ttyS1,38400" diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 21bb2797fc8..5926943d9ab 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -314,19 +314,19 @@ /* Environment - default config is in flash, see below */ #if 0 /* in EEPROM */ # define CONFIG_ENV_IS_IN_EEPROM 1 -# define CFG_ENV_OFFSET 0 -# define CFG_ENV_SIZE 2048 +# define CONFIG_ENV_OFFSET 0 +# define CONFIG_ENV_SIZE 2048 #else /* in flash */ # define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CONFIG_STXSSA_4M -# define CFG_ENV_SECT_SIZE 0x20000 +# define CONFIG_ENV_SECT_SIZE 0x20000 # else /* default configuration - 64 MiB flash */ -# define CFG_ENV_SECT_SIZE 0x40000 +# define CONFIG_ENV_SECT_SIZE 0x40000 # endif -# define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE 0x4000 -# define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) -# define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE 0x4000 +# define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) +# define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index c8b54bf4859..7ba8b770a6c 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -202,15 +202,15 @@ * FLASH organization */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) -#define CFG_ENV_OFFSET 0 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) +#define CONFIG_ENV_OFFSET 0 +#define CONFIG_ENV_SIZE 0x4000 -#define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x00010000) -#define CFG_ENV_OFFSET_REDUND 0 -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x00010000) +#define CONFIG_ENV_OFFSET_REDUND 0 +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CFG_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h index 5299733e079..cc9f6bd3959 100644 --- a/include/configs/suzaku.h +++ b/include/configs/suzaku.h @@ -91,8 +91,8 @@ * NVRAM organization */ #define CONFIG_ENV_IS_NOWHERE 1 -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area (in DPRAM) diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index b7831b4473e..95078460d89 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -230,19 +230,19 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_8B -#define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #elif defined (CONFIG_BOOT_16B) -#define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #elif defined (CONFIG_BOOT_32B) -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #endif /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- diff --git a/include/configs/taihu.h b/include/configs/taihu.h index ad0f5a94405..bcb8732a65b 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -206,13 +206,13 @@ unsigned char spi_read(void); #define CFG_FLASH_WORD_SIZE unsigned short #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- @@ -222,9 +222,9 @@ unsigned char spi_read(void); #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env*/ +#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env*/ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/taishan.h b/include/configs/taishan.h index 9bac0e28834..08ec14c7fa8 100644 --- a/include/configs/taishan.h +++ b/include/configs/taishan.h @@ -101,13 +101,13 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * E2PROM bootstrap configure value diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h index cf2af93d378..bfb32fbf755 100644 --- a/include/configs/tb0229.h +++ b/include/configs/tb0229.h @@ -156,8 +156,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ -#define CFG_ENV_ADDR 0xBFC40000 -#define CFG_ENV_SIZE 0x20000 +#define CONFIG_ENV_ADDR 0xBFC40000 +#define CONFIG_ENV_SIZE 0x20000 #define CFG_DIRECT_FLASH_TFTP diff --git a/include/configs/trab.h b/include/configs/trab.h index 1c8d3cec194..d6d463a2795 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -94,7 +94,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -407,18 +407,18 @@ /* Address and size of Primary Environment Sector */ #ifndef CONFIG_FLASH_8MB -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x20000 #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x4000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x4000 #endif /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index dcfb73c859f..b24979b0606 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -54,7 +54,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -310,12 +310,12 @@ /* Flash environment locations */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* __CONFIG_H */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index cdd7bdf75f8..22ebf0718f4 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -242,13 +242,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/uc101.h b/include/configs/uc101.h index ac5285a866f..c709033f49e 100644 --- a/include/configs/uc101.h +++ b/include/configs/uc101.h @@ -162,7 +162,7 @@ #define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */ #define CFG_MAX_FLASH_SECT 140 /* max num of sects on one chip */ -#define CFG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ +#define CONFIG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ #define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ @@ -177,10 +177,10 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x10000 -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /* * Memory map diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 2844c6354a6..4355e1c8124 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -396,16 +396,16 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}" #if 1 /* AMD AM29LV033C */ #define CFG_MAX_FLASH_SECT 64 /* Max number of sectors in one bank */ -#define CFG_ENV_ADDR 0xFFBF0000 /* flash sector SA63 */ -#define CFG_ENV_SECT_SIZE (64*1024) /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFFBF0000 /* flash sector SA63 */ +#define CONFIG_ENV_SECT_SIZE (64*1024) /* Size of the Environment Sector */ #else /* AMD AM29LV116D */ #define CFG_MAX_FLASH_SECT 35 /* Max number of sectors in one bank */ -#define CFG_ENV_ADDR 0xFF9FA000 /* flash sector SA33 */ -#define CFG_ENV_SECT_SIZE (8*1024) /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR 0xFF9FA000 /* flash sector SA33 */ +#define CONFIG_ENV_SECT_SIZE (8*1024) /* Size of the Environment Sector */ #endif /* #if */ -#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Size of the Environment */ -#define CFG_ENV_OFFSET 0 /* starting right at the beginning */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Size of the Environment */ +#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ diff --git a/include/configs/v37.h b/include/configs/v37.h index 7e5f804228a..7504fa39b29 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -196,10 +196,10 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_NVRAM 1 -#define CFG_ENV_ADDR 0x80000000/* Address of Environment */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR 0x80000000/* Address of Environment */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0 +#define CONFIG_ENV_OFFSET 0 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/v38b.h b/include/configs/v38b.h index e0bd8c79764..0f8d5a91574 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -214,9 +214,9 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) -#define CFG_ENV_SIZE 0x10000 -#define CFG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_OVERWRITE 1 /* diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h index 5132293def6..1636d420d91 100644 --- a/include/configs/v5fx30teval.h +++ b/include/configs/v5fx30teval.h @@ -28,10 +28,10 @@ /*Env*/ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_OFFSET 0x1A0000 -#define CFG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x1A0000 +#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ #define CFG_PROMPT "v5fx30t:/# " /* Monitor Command Prompt */ diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 4a54b9028d6..6034cb7c695 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -71,7 +71,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -186,9 +186,9 @@ #define PHYS_FLASH_1 (CFG_FLASH_BASE) #define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */ -#define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */ -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#define CONFIG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x01f00000 /* environment starts here */ +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) #endif /* __CONFIG_H */ diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 6250926281b..10dbed96ff2 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -210,12 +210,12 @@ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index fee3ab996f8..312f720c64f 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -75,11 +75,11 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) -#define CFG_ENV_SIZE (8 * 1024) -#define CFG_ENV_SECT_SIZE (64 * 1024) -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) +#define CONFIG_ENV_SIZE (8 * 1024) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/walnut.h b/include/configs/walnut.h index fc267d114fc..9676cd633ea 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -161,13 +161,13 @@ #define CFG_FLASH_WORD_SIZE unsigned char #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- @@ -177,9 +177,9 @@ #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ #ifdef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /*----------------------------------------------------------------------- diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h index 9baf730798f..2072f6ecfef 100644 --- a/include/configs/wepep250.h +++ b/include/configs/wepep250.h @@ -98,7 +98,7 @@ /* * Malloc pool need to host env + 128 Kb reserve for other allocations. */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + (128<<10) ) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) ) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_STACKSIZE (120<<10) /* stack size */ @@ -179,8 +179,8 @@ #define CFG_MONITOR_BASE PHYS_FLASH_1 #define CFG_MONITOR_LEN 0x20000 /* 128kb ( 1 flash sector ) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR 0x20000 /* absolute address for now */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR 0x20000 /* absolute address for now */ +#define CONFIG_ENV_SIZE 0x2000 #undef CONFIG_ENV_OVERWRITE /* env is not writable now */ diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 3c32d9f9a30..ec73224fb11 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -109,7 +109,7 @@ * Size of malloc() pool; this lives below the uppermost 128 KiB which are * used for the RAM copy of the uboot code */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -177,8 +177,8 @@ /* FIXME */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ /* * Stack sizes diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index fdefc4e833d..e968651c4c2 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -28,10 +28,10 @@ /*Env*/ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x20000 -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_OFFSET 0x340000 -#define CFG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x20000 +#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x340000 +#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ #define CFG_PROMPT "board:/# " /* Monitor Command Prompt */ diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h index 40293cd8429..6c7abb20899 100644 --- a/include/configs/xilinx-ppc440.h +++ b/include/configs/xilinx-ppc440.h @@ -30,7 +30,7 @@ #define CFG_SDRAM_BASE 0x0 #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MONITOR_LEN (192 * 1024) -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) /*Uart*/ #define CONFIG_XILINX_UARTLITE diff --git a/include/configs/xm250.h b/include/configs/xm250.h index d01898f2df1..aac03a17aa1 100644 --- a/include/configs/xm250.h +++ b/include/configs/xm250.h @@ -185,9 +185,9 @@ #define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */ -#define CFG_ENV_SIZE 0x4000 -#define CFG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 +#define CONFIG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ #define CFG_MONITOR_LEN 0x20000 /* 128 KiB */ /****************************************************************************** diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h index 709423dbe0a..443392f6d9d 100644 --- a/include/configs/xsengine.h +++ b/include/configs/xsengine.h @@ -81,16 +81,16 @@ /* Environment settings */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector (after monitor)*/ -#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Size of the Environment Sector */ -#define CFG_ENV_SIZE 0x4000 /* 16kB Total Size of Environment Sector */ +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector (after monitor)*/ +#define CONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Size of the Environment Sector */ +#define CONFIG_ENV_SIZE 0x4000 /* 16kB Total Size of Environment Sector */ /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (75*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (50*CFG_HZ) /* Timeout for Flash Write */ /* Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* Hardware drivers */ diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h index 7bd142469db..0e337146576 100644 --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@ -151,8 +151,8 @@ #define CFG_NO_FLASH 1 #define CONFIG_ENV_IS_NOWHERE 1 -#define CFG_ENV_SIZE 0x1000 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFIG_ENV_SIZE) /* * BOOTP options diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 528776a2432..afdce823799 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -119,13 +119,13 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- @@ -148,8 +148,8 @@ #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 #ifdef CONFIG_ENV_IS_IN_EEPROM -#define CFG_ENV_SIZE 0x200 /* Size of Environment vars */ -#define CFG_ENV_OFFSET 0x0 +#define CONFIG_ENV_SIZE 0x200 /* Size of Environment vars */ +#define CONFIG_ENV_OFFSET 0x0 #endif /* CONFIG_ENV_IS_IN_EEPROM */ /* I2C SYSMON (LM75, AD7414 is almost compatible) */ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index d85da94bd98..92d45d0344e 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -189,10 +189,10 @@ #define CFG_FLASH_2ND_ADDR 0xe7c00000 /* evb440SPe has 8 and 16bit device*/ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ -#define CFG_ENV_ADDR 0xfffa0000 -/* #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) */ -#define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR 0xfffa0000 +/* #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) */ +#define CONFIG_ENV_SIZE 0x10000 /* Size of Environment vars */ #endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/zeus.h b/include/configs/zeus.h index fdb4e3711e5..ac4f813a9ff 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -227,13 +227,13 @@ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ #ifdef CONFIG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /*----------------------------------------------------------------------- diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h index 47ce15d0e01..148079c000c 100644 --- a/include/configs/zylonite.h +++ b/include/configs/zylonite.h @@ -50,7 +50,7 @@ /* * Size of malloc() pool */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* @@ -232,9 +232,9 @@ #define CFG_NO_FLASH 1 #define CONFIG_ENV_IS_IN_NAND 1 -#define CFG_ENV_OFFSET 0x40000 -#define CFG_ENV_OFFSET_REDUND 0x44000 -#define CFG_ENV_SIZE 0x4000 +#define CONFIG_ENV_OFFSET 0x40000 +#define CONFIG_ENV_OFFSET_REDUND 0x44000 +#define CONFIG_ENV_SIZE 0x4000 #endif /* __CONFIG_H */ |