Merge git://git.denx.de/u-boot-net

[oweals/u-boot.git] / include / configs / sbc8548.h

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 7c5961a670be727ffa1b3391d18881a59e2ea859..e872e7f81017b764bcf20ee5a08689bca39d82a7 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -86,8 +86,6 @@
  */
 #define CONFIG_ENABLE_36BIT_PHYS       1
 
-#define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init */
-
 #undef CONFIG_SYS_DRAM_TEST                    /* memory test, takes time */
 #define CONFIG_SYS_MEMTEST_START       0x00200000      /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END         0x00400000
@@ -116,7 +114,6 @@
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_VERY_BIG_RAM
 
-#define CONFIG_NUM_DDR_CONTROLLERS     1
 #define CONFIG_DIMM_SLOTS_PER_CTLR     1
 #define CONFIG_CHIP_SELECTS_PER_CTRL   2
 
@@ -572,8 +569,6 @@
 
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs*/
 
-#define CONFIG_BAUDRATE        115200
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
 "netdev=eth0\0"                                                \
 "uboot=" __stringify(CONFIG_UBOOTPATH) "\0"                            \