TQM8xx: use the CFI flash driver on all TQM8xx boards

[u-boot] / include / configs / eXalion.h

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 5ebc7a9cc871db08b46584f79fd92d1710efb893..f8e2c885b064d6112dad78fb080fc19de68c9881 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -50,25 +50,35 @@
 #error #### Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
 #endif
 /* older kernels need clock in MHz newer in Hz */
-                                       /* #define CONFIG_CLOCKS_IN_MHZ 1 *//* clocks passsed to Linux in MHz       */
+                                       /* #define CONFIG_CLOCKS_IN_MHZ 1 */ /* clocks passsed to Linux in MHz      */
 #undef CONFIG_CLOCKS_IN_MHZ
 
 #define CONFIG_BOOTDELAY       10
 
 
-                                                   /*#define CONFIG_DRAM_SPEED       66   *//* MHz                          */
+                                                   /*#define CONFIG_DRAM_SPEED       66   */ /* MHz                         */
 
-#define CONFIG_COMMANDS                (   CONFIG_CMD_DFL  | \
-                                   CFG_CMD_FLASH   | \
-                                   CFG_CMD_SDRAM   | \
-                                   CFG_CMD_I2C     | \
-                                   CFG_CMD_IDE     | \
-                                   CFG_CMD_FAT     | \
-                                   CFG_CMD_ENV     | \
-                                   CFG_CMD_PCI )
+/*
+ * 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>
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
-#include <cmd_confdefs.h>
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_PCI
 
 
 /*-----------------------------------------------------------------------
@@ -230,7 +240,7 @@
 #define CONFIG_SYS_CLK_FREQ    33333333        /* external frequency to pll    */
 #define CONFIG_PLL_PCI_TO_MEM_MULTIPLIER  2    /* for MPC8240 only             */
 
-                                      /*#define CONFIG_133MHZ_DRAM      1 *//* For 133 MHZ DRAM only !!!!!!!!!!!    */
+                                      /*#define CONFIG_133MHZ_DRAM      1 */ /* For 133 MHZ DRAM only !!!!!!!!!!!    */
 
 #if defined (CONFIG_MPC8245)
 /* Bit-field values for PMCR2.                                                 */
@@ -398,7 +408,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
 #endif