Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

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

diff --git a/include/configs/ml300.h b/include/configs/ml300.h
index bcd5c17..1945918 100644 (file)
--- a/include/configs/ml300.h
+++ b/include/configs/ml300.h
@@ -56,6 +56,11 @@
 #define CONFIG_4xx             1       /* ...member of PPC4xx family   */
 #define CONFIG_XILINX_ML300    1       /* ...on a Xilinx ML300 board   */
 
+#define CONFIG_SYSTEMACE       1
+#define CONFIG_DOS_PARTITION   1
+#define CFG_SYSTEMACE_BASE     XPAR_OPB_SYSACE_0_BASEADDR
+#define CFG_SYSTEMACE_WIDTH    XPAR_XSYSACE_MEM_WIDTH
+
 #define CFG_ENV_IS_IN_EEPROM   1       /* environment is in EEPROM */
 
 /* following are used only if env is in EEPROM */
@@ -82,13 +87,28 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
-#define REMOVE_COMMANDS               (CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_FAT | \
-                               CFG_CMD_IMLS )
-#define CONFIG_COMMANDS               ((CONFIG_CMD_DFL | CFG_CMD_NET) \
-                               & ~REMOVE_COMMANDS)
 
-/* 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_NET
+
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_FAT
+#undef CONFIG_CMD_IMLS
+
 
 /* #define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ */
 /* 300000000 */
@@ -140,12 +160,6 @@
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                16384   /* For IBM 405 CPUs     */
-#define CFG_CACHELINE_SIZE     32      /* ...                  */
-
-/*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */