global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index c51c4f2..1e843f8 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -10,8 +10,7 @@
 #include "ls1012a_common.h"
 
 /* DDR */
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
-#define CONFIG_SYS_SDRAM_SIZE          0x40000000
+#define CFG_SYS_SDRAM_SIZE             0x40000000
 
 /*
  * I2C IO expander
@@ -37,15 +36,10 @@
 #define __PHY_ETH2_MASK                0xFB
 #define __PHY_ETH1_MASK                0xFD
 
-#define CONFIG_PCIE1           /* PCIE controller 1 */
-
-#define CONFIG_PCI_SCAN_SHOW
-
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS         \
        "verify=no\0"                           \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "kernelheader_addr=0x600000\0"          \
        "scriptaddr=0x80000000\0"               \