Subject: ARM: OMAP3: Fix CONFIG definitions due to upstream change From: Dirk Behme Upstream changed some CFG_xxx to CONFIG_xxx. Fix this to allow compilation again. Signed-off-by: Dirk Behme --- cpu/omap3/mem.c | 8 ++++---- cpu/omap3/sys_info.c | 2 +- include/configs/omap3_beagle.h | 10 +++++----- include/configs/omap3_evm.h | 10 +++++----- include/configs/omap3_overo.h | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) Index: u-boot_steve/cpu/omap3/mem.c =================================================================== --- u-boot_steve.orig/cpu/omap3/mem.c +++ u-boot_steve/cpu/omap3/mem.c @@ -248,7 +248,7 @@ void gpmc_init(void) #if defined(CONFIG_CMD_NAND) /* CS 0 */ gpmc_config = gpmc_m_nand; -#if defined(CFG_ENV_IS_IN_NAND) +#if defined(CONFIG_ENV_IS_IN_NAND) gpmc_base = GPMC_CONFIG_CS0 + (0 * GPMC_CONFIG_WIDTH); #else gpmc_base = GPMC_CONFIG_CS0 + (1 * GPMC_CONFIG_WIDTH); @@ -258,7 +258,7 @@ void gpmc_init(void) enable_gpmc_config(gpmc_config, gpmc_base, base, size); is_nand = 1; nand_cs_base = gpmc_base; -#if defined(CFG_ENV_IS_IN_NAND) +#if defined(CONFIG_ENV_IS_IN_NAND) f_off = SMNAND_ENV_OFFSET; f_sec = SZ_128K; /* env setup */ @@ -271,7 +271,7 @@ void gpmc_init(void) #if defined(CONFIG_CMD_ONENAND) gpmc_config = gpmc_onenand; -#if defined(CFG_ENV_IS_IN_ONENAND) +#if defined(CONFIG_ENV_IS_IN_ONENAND) gpmc_base = GPMC_CONFIG_CS0 + (0 * GPMC_CONFIG_WIDTH); #else gpmc_base = GPMC_CONFIG_CS0 + (1 * GPMC_CONFIG_WIDTH); @@ -281,7 +281,7 @@ void gpmc_init(void) enable_gpmc_config(gpmc_config, gpmc_base, base, size); is_onenand = 1; onenand_cs_base = gpmc_base; -#if defined(CFG_ENV_IS_IN_ONENAND) +#if defined(CONFIG_ENV_IS_IN_ONENAND) f_off = ONENAND_ENV_OFFSET; f_sec = SZ_128K; /* env setup */ Index: u-boot_steve/cpu/omap3/sys_info.c =================================================================== --- u-boot_steve.orig/cpu/omap3/sys_info.c +++ u-boot_steve/cpu/omap3/sys_info.c @@ -39,7 +39,7 @@ extern omap3_sysinfo sysinfo; ***************************************************************************/ u32 get_gpmc0_type(void) { -#if defined(CFG_ENV_IS_IN_ONENAND) +#if defined(CONFIG_ENV_IS_IN_ONENAND) return 1; /* OneNAND */ #else return 2; /* NAND */ Index: u-boot_steve/include/configs/omap3_beagle.h =================================================================== --- u-boot_steve.orig/include/configs/omap3_beagle.h +++ u-boot_steve/include/configs/omap3_beagle.h @@ -57,8 +57,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CONFIG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */ /* @@ -240,13 +240,13 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at start of flash */ #define CFG_ONENAND_BASE ONENAND_MAP -#define CFG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_IS_IN_NAND 1 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CFG_ENV_SECT_SIZE boot_flash_sec -#define CFG_ENV_OFFSET boot_flash_off -#define CFG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET boot_flash_off +#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET /*----------------------------------------------------------------------- * CFI FLASH driver setup Index: u-boot_steve/include/configs/omap3_evm.h =================================================================== --- u-boot_steve.orig/include/configs/omap3_evm.h +++ u-boot_steve/include/configs/omap3_evm.h @@ -63,8 +63,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CONFIG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */ /* @@ -252,13 +252,13 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at start of flash */ #define CFG_ONENAND_BASE ONENAND_MAP -#define CFG_ENV_IS_IN_ONENAND 1 +#define CONFIG_ENV_IS_IN_ONENAND 1 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CFG_ENV_SECT_SIZE boot_flash_sec -#define CFG_ENV_OFFSET boot_flash_off -#define CFG_ENV_ADDR boot_flash_env_addr +#define CONFIG_ENV_OFFSET boot_flash_off +#define CONFIG_ENV_ADDR boot_flash_env_addr /*----------------------------------------------------------------------- * CFI FLASH driver setup Index: u-boot_steve/include/configs/omap3_overo.h =================================================================== --- u-boot_steve.orig/include/configs/omap3_overo.h +++ u-boot_steve/include/configs/omap3_overo.h @@ -48,8 +48,8 @@ /* * Size of malloc() pool */ -#define CFG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ -#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) +#define CONFIG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ +#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */ /* @@ -231,13 +231,13 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at start of flash */ #define CFG_ONENAND_BASE ONENAND_MAP -#define CFG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_IS_IN_NAND 1 #define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */ #define CFG_ENV_SECT_SIZE boot_flash_sec -#define CFG_ENV_OFFSET boot_flash_off -#define CFG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET boot_flash_off +#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET /*----------------------------------------------------------------------- * CFI FLASH driver setup