Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 252b3fc70656daa5dcc634e3425439923e9f74b4..ac8c59f4f22c6a10d1135cfd22dc12a86d037925 100644 (file)
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -16,16 +16,11 @@
 /* High Level Configuration Options */
 #define CONFIG_MX51
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_SYS_NO_FLASH            /* No NOR Flash */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage bootloader */
 
 #define CONFIG_HW_WATCHDOG
 
-#define CONFIG_MACH_TYPE       MACH_TYPE_TS48XX
-
 /* text base address used when linking */
 #define CONFIG_SYS_TEXT_BASE   0x90008000
 
@@ -62,10 +57,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      MMC_SDHC1_BASE_ADDR
 
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
-
-#define CONFIG_MMC
-
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DOS_PARTITION
 
@@ -157,8 +148,6 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_SYS_INIT_SP_OFFSET \
        (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR \