configs: Re-sync HUSH options

[people/ms/u-boot.git] / include / configs / malta.h

diff --git a/include/configs/malta.h b/include/configs/malta.h
index cc574ed040080bbae84611815ea84f226aaf85a9..7f93b94e1f949139cdfb28d77a9f3a5e4185dd56 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -7,13 +7,12 @@
 #ifndef _MALTA_CONFIG_H
 #define _MALTA_CONFIG_H
 
-#include <asm/addrspace.h>
-#include <asm/malta.h>
-
 /*
  * System configuration
  */
 #define CONFIG_MALTA
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_MEMSIZE_IN_BYTES
 
@@ -35,8 +34,6 @@
 #define CONFIG_SYS_MHZ                 250     /* arbitrary value */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     (CONFIG_SYS_MHZ * 1000000)
 
-#define CONFIG_SWAP_IO_SPACE
-
 /*
  * Memory map
  */
@@ -59,6 +56,7 @@
 /*
  * Console configuration
  */
+#undef CONFIG_SYS_PROMPT
 #if defined(CONFIG_SYS_LITTLE_ENDIAN)
 #define CONFIG_SYS_PROMPT              "maltael # "
 #else
@@ -78,18 +76,17 @@
  */
 #define CONFIG_BAUDRATE                        115200
 
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         (115200 * 16)
-#define CONFIG_SYS_NS16550_COM1                CKSEG1ADDR(MALTA_GT_UART0_BASE)
-#define CONFIG_SYS_NS16550_COM2                CKSEG1ADDR(MALTA_MSC01_UART0_BASE)
+#define CONFIG_SYS_NS16550_COM1                0xb80003f8
+#define CONFIG_SYS_NS16550_COM2                0xbb0003f8
 #define CONFIG_CONS_INDEX              1
 
 /*
  * Flash configuration
  */
-#define CONFIG_SYS_FLASH_BASE          (KSEG1 | MALTA_FLASH_BASE)
+#define CONFIG_SYS_FLASH_BASE          0xbe000000
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      128
 #define CONFIG_SYS_FLASH_CFI
@@ -106,17 +103,21 @@
        (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
 
 /*
- * Commands
+ * IDE/ATA
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
+#define CONFIG_SYS_IDE_MAXBUS          1
+#define CONFIG_SYS_IDE_MAXDEVICE       2
+#define CONFIG_SYS_ATA_BASE_ADDR       CONFIG_SYS_ISA_IO_BASE_ADDRESS
+#define CONFIG_SYS_ATA_IDE0_OFFSET     0x01f0
+#define CONFIG_SYS_ATA_DATA_OFFSET     0
+#define CONFIG_SYS_ATA_REG_OFFSET      0
 
+/*
+ * Commands
+ */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_IDE
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING