Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 2bd98b3..9c5bbff 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -75,14 +75,34 @@
 #define CFG_DTT_LOW_TEMP       -30
 #define CFG_DTT_HYSTERESIS     3
 
-#define CONFIG_COMMANDS                \
-       (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_IRQ | CFG_CMD_ASKENV | \
-        CFG_CMD_DHCP | CFG_CMD_BEDBUG | CFG_CMD_DATE | CFG_CMD_I2C | \
-        CFG_CMD_EEPROM | CFG_CMD_ELF | CFG_CMD_BSP | CFG_CMD_REGINFO | \
-        CFG_CMD_DTT)
 
-/* 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>
+
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_DTT
+
 
 #undef CONFIG_WATCHDOG                         /* watchdog disabled            */
 #define CONFIG_HW_WATCHDOG                     /* HW Watchdog, board specific  */
@@ -98,7 +118,7 @@
 #ifdef  CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2     "> "
 #endif
-#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      */
@@ -141,10 +161,10 @@
 #define CFG_PCI_SUBSYS_DEVICEID 0x0156         /* PCI Device ID: 405GP         */
 #define CFG_PCI_PTM1LA         0x00000000      /* point to sdram               */
 #define CFG_PCI_PTM1MS         0x80000001      /* 2GB, enable hard-wired to 1  */
-#define CFG_PCI_PTM1PCI        0x00000000      /* Host: use this pci address   */
-#define CFG_PCI_PTM2LA         0x00000000      /* disabled             */
-#define CFG_PCI_PTM2MS         0x00000000      /* disabled             */
-#define CFG_PCI_PTM2PCI        0x00000000      /* Host: use this pci address   */
+#define CFG_PCI_PTM1PCI                0x00000000      /* Host: use this pci address   */
+#define CFG_PCI_PTM2LA         0x00000000      /* disabled                     */
+#define CFG_PCI_PTM2MS         0x00000000      /* disabled                     */
+#define CFG_PCI_PTM2PCI                0x00000000      /* Host: use this pci address   */
 
 /*-----------------------------------------------------------------------
  * Set up values for external bus controller
@@ -236,23 +256,23 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1               /* use NVRAM for env vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1               /* use NVRAM for env vars       */
 #define CFG_NVRAM_BASE_ADDR    0xfc000000      /* NVRAM base address           */
 #define CFG_NVRAM_SIZE         (32*1024)       /* NVRAM size                   */
-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-/*define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env  */
-#define CFG_ENV_ADDR           CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+/*define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env  */
+#define CONFIG_ENV_ADDR                CFG_NVRAM_BASE_ADDR
 
 #else /* Use Boot Flash for environment variables */
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_OFFSET         0x00040000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE           0x10000         /* Total Size of env. sector    */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000         /* Total Size of env. sector    */
 
-#define CFG_ENV_SECT_SIZE      0x10000         /* see README - env sec tot sze */
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* see README - env sec tot sze */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -273,15 +293,6 @@
  */
 #define SPD_EEPROM_ADDRESS      0x50   /* XXX conflicting address!!! XXX */
 
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                8192            /* For AMCC 405 CPUs                    */
-#define CFG_CACHELINE_SIZE     32              /* ...          */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT    5               /* log base 2 of the above val. */
-#endif
-
 /*
  * Init Memory Controller:
  */
@@ -310,7 +321,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