Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[oweals/u-boot.git] / include / configs / SL8245.h

diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h
index 4b69456e4433cd2e61ed78469c426ca876891d33..31853c8de3a5e6e6d89c81c3524ebce30c47a827 100644 (file)
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -51,11 +51,24 @@
 
 #define CONFIG_BOOTDELAY       5
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | CFG_CMD_PCI)
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
-/* 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
 
 
 /*
@@ -68,7 +81,7 @@
 /* Print Buffer Size
  */
 #define CFG_PBSIZE     (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
-#define CFG_MAXARGS    8               /* Max number of command args   */
+#define CFG_MAXARGS    32              /* Max number of command args   */
 #define CFG_BARGSIZE   CFG_CBSIZE      /* Boot Argument Buffer Size    */
 #define CFG_LOAD_ADDR  0x00400000      /* Default load address         */
 
@@ -77,10 +90,10 @@
  * (Set up by the startup code)
  * Please note that CFG_SDRAM_BASE _must_ start at 0
  */
-#define CFG_SDRAM_BASE         0x00000000
+#define CFG_SDRAM_BASE         0x00000000
 
 #define CFG_FLASH_BASE0_PRELIM 0xFF800000      /* FLASH bank on RCS#0 */
-#define CFG_FLASH_BASE                 CFG_FLASH_BASE0_PRELIM
+#define CFG_FLASH_BASE         CFG_FLASH_BASE0_PRELIM
 #define CFG_FLASH_BANKS                { CFG_FLASH_BASE0_PRELIM }
 
 #define CFG_RESET_ADDRESS   0xFFF00100
@@ -253,7 +266,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