x86: Convert to use DM VESA video driver

[J-u-boot.git] / include / configs / spear-common.h

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index c0eba3721d70d30306f2ea9826d63a19547ac3e2..a6973c56ac0e1f9b7f89548c52eae6143a59be37 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -11,14 +11,11 @@
  * Common configurations used for both spear3xx as well as spear6xx
  */
 
  * Common configurations used for both spear3xx as well as spear6xx
  */
 

-/* U-boot Load Address */
+/* U-Boot Load Address */

 #define CONFIG_SYS_TEXT_BASE                   0x00700000
 
 /* Ethernet driver configuration */
 #define CONFIG_MII
 #define CONFIG_SYS_TEXT_BASE                   0x00700000
 
 /* Ethernet driver configuration */
 #define CONFIG_MII

-#define CONFIG_DESIGNWARE_ETH
-#define CONFIG_NET_MULTI
-#define CONFIG_PHYLIB

 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
 
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
 


@@ -37,8 +34,7 @@
 #define CONFIG_EXTRA_ENV_USBTTY                        "usbtty=cdc_acm\0"
 
 /* I2C driver configuration */
 #define CONFIG_EXTRA_ENV_USBTTY                        "usbtty=cdc_acm\0"
 
 /* I2C driver configuration */

-#define CONFIG_HARD_I2C
-#define CONFIG_DW_I2C
+#define CONFIG_SYS_I2C

 #if defined(CONFIG_SPEAR600)
 #define CONFIG_SYS_I2C_BASE                    0xD0200000
 #elif defined(CONFIG_SPEAR300)
 #if defined(CONFIG_SPEAR600)
 #define CONFIG_SYS_I2C_BASE                    0xD0200000
 #elif defined(CONFIG_SPEAR300)


@@ -97,34 +93,17 @@
 #define CONFIG_NAND_FSMC
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_FSMC
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define CONFIG_SYS_NAND_ONFI_DETECTION

-#define CONFIG_SYS_NAND_QUIET_TEST

 
 /*
  * Command support defines
  */
 
 /*
  * Command support defines
  */

-#define CONFIG_CMD_I2C

 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_ENV

-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_RUN

 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_SAVES

-#define CONFIG_CMD_NET
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <config_cmd_default.h>

 
 /*
  * Default Environment Varible definitions
  */
 
 /*
  * Default Environment Varible definitions
  */

-#if defined(CONFIG_SPEAR_USBTTY)
-#define CONFIG_BOOTDELAY                       -1
-#else
-#define CONFIG_BOOTDELAY                       1
-#endif
-

 #define CONFIG_ENV_OVERWRITE
 
 /*
 #define CONFIG_ENV_OVERWRITE
 
 /*


@@ -188,7 +167,6 @@
                "console=ttyAMA0,115200 $(othbootargs);"                \
        CONFIG_BOOTCOMMAND
 
                "console=ttyAMA0,115200 $(othbootargs);"                \
        CONFIG_BOOTCOMMAND
 

-

 #define CONFIG_ENV_SIZE                                0x02000
 #define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_ENV_SIZE                                0x02000
 #define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE
 


@@ -200,18 +178,11 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_MISC_INIT_R
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_MISC_INIT_R

-#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR               " "
-#define CONFIG_AUTOBOOT_PROMPT                 \
-               "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay

 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (1024*1024)
 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (1024*1024)

-#define CONFIG_IDENT_STRING                    "-SPEAr"

 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_LONGHELP

-#define CONFIG_SYS_PROMPT                      "u-boot> "

 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE                      256
 #define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE + \
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE                      256
 #define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE + \