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

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

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index de5c3ce..564607e 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -13,8 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 /*
  * High Level Configuration Options
  */
@@ -27,12 +25,9 @@
 #define CONFIG_SYS_TEXT_BASE   0xfe000000
 #endif
 
-#define CONFIG_PCI             1
 #define CONFIG_PCI_INDIRECT_BRIDGE 1
 #define CONFIG_FSL_ELBC                1
 
-#define CONFIG_BOARD_EARLY_INIT_F      1
-
 /*
  * On-board devices
  *
@@ -256,9 +251,6 @@
 #define CONFIG_SYS_NS16550_COM1        (CONFIG_SYS_IMMR+0x4500)
 #define CONFIG_SYS_NS16550_COM2        (CONFIG_SYS_IMMR+0x4600)
 
-/* Use the HUSH parser */
-#define CONFIG_SYS_HUSH_PARSER
-
 #if defined(CONFIG_PCI)
 /*
  * General PCI
@@ -274,7 +266,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS                0xE2000000
 #define CONFIG_SYS_PCI1_IO_SIZE                0x00100000      /* 1M */
 
-#define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957  /* Freescale */
 #endif
 
@@ -283,7 +274,6 @@
  */
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
-
 #define CONFIG_TSEC1
 #ifdef CONFIG_TSEC1
 #define CONFIG_HAS_ETH0
@@ -324,9 +314,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_PCI
 
 #define CONFIG_CMDLINE_EDITING 1
@@ -472,7 +459,6 @@
 #define CONFIG_HOSTNAME                ve8313
 #define CONFIG_UBOOTPATH       ve8313/u-boot.bin
 
-#define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
 #define CONFIG_EXTRA_ENV_SETTINGS \