rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index f1ffcb3..5ba1706 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -33,11 +33,11 @@
  * (easy to change)
  */
 
-#define CONFIG_405GP           1       /* This is a PPC405GP CPU       */
+#define CONFIG_405GP           1       /* This is a PPC405GP CPU       */
 #define CONFIG_4xx             1       /* ...member of PPC4xx family   */
 #define CONFIG_EXBITGEN                1       /* on a Exbit Generic board     */
 
-#define CONFIG_BOARD_PRE_INIT  1       /* Call board_pre_init          */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 
 #define CONFIG_SYS_CLK_FREQ     25000000 /* external frequency to pll   */
 
@@ -47,25 +47,25 @@
 #define CFG_I2C_SLAVE          0x7F    /* I2C slave address            */
 
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM    1
-#undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#define CONFIG_ENV_IS_IN_EEPROM    1
+#undef CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_NVRAM
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR            0x56    /* 1010110 */
 #define CFG_I2C_EEPROM_ADDR_LEN                1       /* 8-bit internal addressing */
 #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    */
 /* Explanation:
    autbooting is altogether disabled and cannot be
    enabled if CONFIG_BOOTDELAY is negative.
-   If you want shorter bootdelay, then 
+   If you want shorter bootdelay, then
    - "setenv bootdelay <delay>" to the proper value
 */
 
@@ -82,10 +82,21 @@
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
@@ -94,7 +105,7 @@
  */
 #define CFG_LONGHELP                   /* undef to save memory         */
 #define CFG_PROMPT     "=> "           /* Monitor Command Prompt       */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define        CFG_CBSIZE      1024            /* Console I/O Buffer Size      */
 #else
 #define        CFG_CBSIZE      256             /* Console I/O Buffer Size      */
@@ -111,11 +122,11 @@
 
 /* Default baud rate */
 #define CONFIG_BAUDRATE                115200
-       
+
 /* The following table includes the supported baudrates */
 #define CFG_BAUDRATE_TABLE      \
-        { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
-         57600, 115200, 230400, 460800, 921600 }
+       { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
+        57600, 115200, 230400, 460800, 921600 }
 
 #define CFG_CLKS_IN_HZ         1       /* everything, incl board info, in Hz */
 
@@ -177,10 +188,10 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#ifdef CFG_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 */
+#ifdef CONFIG_ENV_IS_IN_FLASH
+#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 */
@@ -194,10 +205,6 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-/* Cache configuration */
-#define CFG_DCACHE_SIZE                8192
-#define CFG_CACHELINE_SIZE     32
-
 /*
  * Internal Definitions
  *
@@ -206,7 +213,7 @@
 #define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif