Convert CONFIG_ENV_IS_IN_FLASH to Kconfig

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

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 3d4c8a81024bfe67c7ab13ccd04e648106bf4dca..0a2bcb2383292e6f87a009ca0bbc3895a4c17543 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -531,7 +531,6 @@
 #if defined(CONFIG_SYS_RAMBOOT)
 
 #else
-       #define CONFIG_ENV_IS_IN_FLASH  1
        #if CONFIG_SYS_MONITOR_BASE > 0xfff80000
        #define CONFIG_ENV_ADDR 0xfff80000
        #else
@@ -547,21 +546,17 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
-#define CONFIG_SCSI
 #endif
 
 /*
  * USB
  */
-#define CONFIG_USB_EHCI
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_PCI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_PCI_EHCI_DEVICE                 0
@@ -624,8 +619,6 @@
 
 #undef  CONFIG_BOOTARGS                /* the boot command will set bootargs */
 
-#define CONFIG_BAUDRATE        115200
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
 "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1,ecc=off\0"                \
 "netdev=eth0\0"                                                \