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

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 74f4dfc..639da80 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -64,7 +64,6 @@
 /* UBI/UBI config options */
 
 /* Ethernet config options */
-#define CONFIG_MII
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 
 #define CONFIG_SPEAR_GPIO
@@ -76,7 +75,6 @@
 #define CONFIG_SYS_I2C_SLAVE                   0x02
 #define CONFIG_I2C_CHIPADDRESS                 0x50
 
-#define CONFIG_RTC_M41T62      1
 #define CONFIG_SYS_I2C_RTC_ADDR        0x68
 
 /* FPGA config options */
@@ -102,7 +100,6 @@
 #define CONFIG_BOOT_PARAMS_ADDR                        0x00000100
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_MISC_INIT_R
 #define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands      */
 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
@@ -183,7 +180,6 @@
        "\0"
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS                   1
 #define PHYS_SDRAM_1                           0x00000000
 #define PHYS_SDRAM_1_MAXSIZE                   0x40000000