arm: spear: Some changes / updates to the x600 config header

[karo-tx-uboot.git] / include / configs / vl_ma2sc.h

diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index aacb84c8b5ea1500c7e5e4c4a2aac990493cbce4..3facd7f257cc77fe29640c4fbb9e4a2d235a1773 100644 (file)
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -13,8 +13,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define CONFIG_ARM926EJS               /* This is an ARM926EJS Core    */
-#define CONFIG_AT91FAMILY
 #define CONFIG_AT91SAM9263             /* It's an Atmel AT91SAM9263 SoC*/
 #define CONFIG_VL_MA2SC                        /* on an VL_MA2SC Board */
 #define CONFIG_ARCH_CPU_INIT
@@ -85,12 +83,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -320,15 +312,13 @@
 #define CONFIG_SYS_NAND_DBW_8          1
 #define CONFIG_SYS_NAND_MASK_ALE       (1 << 21)       /* our ALE is AD21 */
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)       /* our CLE is AD22 */
-#define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIO_PORTD, 15
-#define CONFIG_SYS_NAND_READY_PIN      AT91_PIO_PORTB, 0
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
+#define CONFIG_SYS_NAND_ENABLE_PIN     GPIO_PIN_PD(15)
+#define CONFIG_SYS_NAND_READY_PIN      GPIO_PIN_PB(0)
 #endif
 
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         5
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
@@ -350,7 +340,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {312500, 230400, 115200, 19200, \
                                                38400, 57600, 9600 }
 
-#define CONFIG_SYS_PROMPT      "U-Boot> "
 #define CONFIG_SYS_CBSIZE      512             /* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS     32              /* max number of command args */
 #define CONFIG_SYS_PBSIZE      \
@@ -363,7 +352,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          \
        ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* 128 bytes for initial data */
 
 #ifndef CONFIG_RAMLOAD
 #define CONFIG_BOOTCOMMAND             "run nfsboot"