rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[platform/kernel/u-boot.git] / include / configs / cmc_pu2.h

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index d22d350..d9c1263 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -50,7 +50,7 @@
 #define MC_ASR_VAL     0x00000000
 #define MC_AASR_VAL    0x00000000
 #define EBI_CFGR_VAL   0x00000000
-#define SMC2_CSR_VAL   0x100032ad /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL   0x100032ad /* 16bit, 2 TDF, 4 WS */
 
 /* clocks */
 #define PLLAR_VAL      0x2026BE04 /* 179,712 MHz for PCK */
@@ -172,7 +172,7 @@
 #define CFG_FLASH_ERASE_TOUT           (11 * CFG_HZ)   /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT           ( 2 * CFG_HZ)   /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH            1
+#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 */