pci: Move CONFIG_PCI_PNP to Kconfig

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

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index e412806..2c18e98 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -18,33 +18,18 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF547x_8x      /* define processor family */
-#define CONFIG_M548x           /* define processor type */
-#define CONFIG_M5485           /* define processor type */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                115200
 
-#define CONFIG_HW_WATCHDOG
+#undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_USB
 
 #define CONFIG_SLTTMR
 
@@ -76,18 +61,14 @@
 #              endif
 #      endif                   /* CONFIG_SYS_DISCOVER_PHY */
 
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
-#      define CONFIG_ETH1ADDR  00:e0:0c:bc:e5:61
 #      define CONFIG_IPADDR    192.162.1.2
 #      define CONFIG_NETMASK   255.255.255.0
 #      define CONFIG_SERVERIP  192.162.1.1
 #      define CONFIG_GATEWAYIP 192.162.1.1
-#      define CONFIG_OVERWRITE_ETHADDR_ONCE
 
 #endif
 
 #ifdef CONFIG_CMD_USB
-#      define CONFIG_USB_STORAGE
 #      define CONFIG_DOS_PARTITION
 #      define CONFIG_USB_OHCI_NEW
 #      ifndef CONFIG_CMD_PCI
@@ -110,8 +91,6 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
 #define CONFIG_SYS_PCI_MEM_BUS         0x80000000
@@ -127,7 +106,6 @@
 #define CONFIG_SYS_PCI_CFG_SIZE        0x01000000
 #endif
 
-#define CONFIG_BOOTDELAY       1       /* autoboot after 5 seconds */
 #define CONFIG_UDP_CHECKSUM
 
 #define CONFIG_HOSTNAME                M548xEVB
@@ -144,7 +122,6 @@
        ""
 
 #define CONFIG_PRAM            512     /* 512 KB */
-#define CONFIG_SYS_PROMPT              "-> "
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB