rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 000aaa5..46f80d1 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -61,6 +61,8 @@
 
 #undef CONFIG_ECC                      /* enable ECC support */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /* which initialization functions to call for this board */
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_PRE_INIT
@@ -133,8 +135,14 @@
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 #undef CONFIG_ALTIVEC                  /* undef to disable             */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
 
 
 /*
@@ -142,18 +150,18 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_ASKENV 
-#define CONFIG_CMD_I2C   
-#define CONFIG_CMD_CACHE  
-#define CONFIG_CMD_EEPROM 
-#define CONFIG_CMD_PCI   
-#define CONFIG_CMD_ELF   
-#define CONFIG_CMD_DATE          
-#define CONFIG_CMD_NET   
-#define CONFIG_CMD_PING          
-#define CONFIG_CMD_IDE   
-#define CONFIG_CMD_FAT   
-#define CONFIG_CMD_EXT2          
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT2
 
 
 #define CONFIG_DOS_PARTITION
@@ -286,7 +294,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI          1          /* Flash is CFI conformant           */
 #define CFG_FLASH_PROTECTION   1          /* use hardware protection           */
 #define CFG_FLASH_USE_BUFFER_WRITE 1      /* use buffered writes (20x faster)  */
@@ -564,19 +572,19 @@
 #define CFG_FLASH_LOCK_TOUT    500     /* Timeout for Flash Lock (in ms) */
 
 #if 0
-#define CFG_ENV_IS_IN_FLASH    0
-#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_IS_IN_FLASH
+#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 CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
+#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           */