rename CFG_ENV macros to CONFIG_ENV

[people/ms/u-boot.git] / include / configs / cmc_pu2.h

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index f32c8c2c66bf421c97f92accbda50d2fea9db6f0..9b744384ac781e9c3994f3a59ff3ad5316abb84b 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 */
@@ -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
@@ -148,7 +148,7 @@
 
 #define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM             0x20000000
-#define PHYS_SDRAM_SIZE                0x1000000       /* 16 megs */
+#define PHYS_SDRAM_SIZE                0x1000000       /* 16 megs */
 
 #define CFG_MEMTEST_START      PHYS_SDRAM
 #define CFG_MEMTEST_END                CFG_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
@@ -172,10 +172,10 @@
 #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 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_IS_IN_FLASH         1
+#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 */
 
@@ -186,25 +186,6 @@
 #define CFG_MAXARGS            32              /* max number of command args */
 #define CFG_PBSIZE             (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
 
-#ifndef __ASSEMBLY__
-/*-----------------------------------------------------------------------
- * Board specific extension for bd_info
- *
- * This structure is embedded in the global bd_info (bd_t) structure
- * and can be used by the board specific code (eg board/...)
- */
-
-struct bd_info_ext {
-       /* helper variable for board environment handling
-        *
-        * env_crc_valid == 0    =>   uninitialised
-        * env_crc_valid  > 0    =>   environment crc in flash is valid
-        * env_crc_valid  < 0    =>   environment crc in flash is invalid
-        */
-       int env_crc_valid;
-};
-#endif /* __ASSEMBLY__ */
-
 #define CFG_HZ 1000
 #define CFG_HZ_CLOCK (AT91C_MASTER_CLOCK/2)    /* AT91C_TC0_CMR is implicitly set to */
                                                /* AT91C_TC_TIMER_DIV1_CLOCK */