summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-01-23 13:31:20 -0700
committerTom Rini <trini@konsulko.com>2017-01-25 17:38:32 -0500
commita5d67547dd9c7a527dfda1967010e703a22441ff (patch)
tree61fbc8fc661c3b36ae740fe1ed86fbcf08d8d50a /include
parenta421192fb8d49da9a8bc30258c29c51675a1a1c9 (diff)
Convert CONFIG_BOARD_EARLY_INIT_F to Kconfig
This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/BSC9131RDB.h2
-rw-r--r--include/configs/BSC9132QDS.h1
-rw-r--r--include/configs/CPCI2DP.h2
-rw-r--r--include/configs/CPCI4052.h1
-rw-r--r--include/configs/MIP405.h1
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h1
-rw-r--r--include/configs/MPC832XEMDS.h1
-rw-r--r--include/configs/MPC8349EMDS.h2
-rw-r--r--include/configs/MPC837XEMDS.h1
-rw-r--r--include/configs/MPC837XERDB.h1
-rw-r--r--include/configs/MPC8536DS.h2
-rw-r--r--include/configs/MPC8568MDS.h2
-rw-r--r--include/configs/MPC8569MDS.h1
-rw-r--r--include/configs/MPC8610HPCD.h1
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/P1023RDB.h1
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/PATI.h2
-rw-r--r--include/configs/PIP405.h3
-rw-r--r--include/configs/PLU405.h1
-rw-r--r--include/configs/PMC405DE.h1
-rw-r--r--include/configs/PMC440.h1
-rw-r--r--include/configs/T102xQDS.h3
-rw-r--r--include/configs/T102xRDB.h3
-rw-r--r--include/configs/T1040QDS.h3
-rw-r--r--include/configs/T104xRDB.h3
-rw-r--r--include/configs/TQM5200.h1
-rw-r--r--include/configs/TQM834x.h1
-rw-r--r--include/configs/UCP1020.h2
-rw-r--r--include/configs/VOM405.h1
-rw-r--r--include/configs/acadia.h1
-rw-r--r--include/configs/advantech_dms-ba16.h2
-rw-r--r--include/configs/am43xx_evm.h3
-rw-r--r--include/configs/am57xx_evm.h2
-rw-r--r--include/configs/ap121.h2
-rw-r--r--include/configs/ap143.h2
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/aristainetos-common.h2
-rw-r--r--include/configs/armadillo-800eva.h1
-rw-r--r--include/configs/at91-sama5_common.h2
-rw-r--r--include/configs/at91rm9200ek.h2
-rw-r--r--include/configs/at91sam9260ek.h1
-rw-r--r--include/configs/at91sam9263ek.h2
-rw-r--r--include/configs/at91sam9m10g45ek.h1
-rw-r--r--include/configs/at91sam9n12ek.h1
-rw-r--r--include/configs/at91sam9rlek.h1
-rw-r--r--include/configs/at91sam9x5ek.h1
-rw-r--r--include/configs/atngw100.h1
-rw-r--r--include/configs/atngw100mkii.h1
-rw-r--r--include/configs/atstk1002.h1
-rw-r--r--include/configs/axs10x.h1
-rw-r--r--include/configs/bamboo.h2
-rw-r--r--include/configs/bf506f-ezkit.h1
-rw-r--r--include/configs/bf518f-ezbrd.h1
-rw-r--r--include/configs/bf548-ezkit.h1
-rw-r--r--include/configs/bf609-ezkit.h1
-rw-r--r--include/configs/bubinga.h2
-rw-r--r--include/configs/canyonlands.h1
-rw-r--r--include/configs/cgtqmx6eval.h1
-rw-r--r--include/configs/cm-bf548.h1
-rw-r--r--include/configs/colibri_imx6.h1
-rw-r--r--include/configs/colibri_imx7.h1
-rw-r--r--include/configs/colibri_vf.h2
-rw-r--r--include/configs/conga-qeval20-qa3-e3845.h1
-rw-r--r--include/configs/controlcenterd.h2
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/corvus.h1
-rw-r--r--include/configs/cougarcanyon2.h1
-rw-r--r--include/configs/crownbay.h1
-rw-r--r--include/configs/cyrus.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/devkit3250.h1
-rw-r--r--include/configs/dfi-bt700.h1
-rw-r--r--include/configs/dlvision-10g.h1
-rw-r--r--include/configs/dlvision.h1
-rw-r--r--include/configs/dra7xx_evm.h1
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/edb93xx.h2
-rw-r--r--include/configs/el6x_common.h2
-rw-r--r--include/configs/embestmx6boards.h2
-rw-r--r--include/configs/exynos-common.h1
-rw-r--r--include/configs/exynos7420-common.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/galileo.h1
-rw-r--r--include/configs/gdppc440etx.h1
-rw-r--r--include/configs/ge_bx50v3.h2
-rw-r--r--include/configs/grasshopper.h1
-rw-r--r--include/configs/gw_ventana.h1
-rw-r--r--include/configs/hikey.h2
-rw-r--r--include/configs/hrcon.h1
-rw-r--r--include/configs/icon.h1
-rw-r--r--include/configs/imx31_phycore.h1
-rw-r--r--include/configs/intip.h1
-rw-r--r--include/configs/io.h1
-rw-r--r--include/configs/io64.h1
-rw-r--r--include/configs/iocon.h1
-rw-r--r--include/configs/ipam390.h1
-rw-r--r--include/configs/jupiter.h1
-rw-r--r--include/configs/katmai.h1
-rw-r--r--include/configs/kilauea.h1
-rw-r--r--include/configs/km/km_arm.h1
-rw-r--r--include/configs/km/kmp204x-common.h1
-rw-r--r--include/configs/kzm9g.h1
-rw-r--r--include/configs/legoev3.h1
-rw-r--r--include/configs/liteboard.h2
-rw-r--r--include/configs/ls1012a_common.h1
-rw-r--r--include/configs/ls1021aiot.h2
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls1043a_common.h1
-rw-r--r--include/configs/ls1046a_common.h1
-rw-r--r--include/configs/ls2080a_common.h1
-rw-r--r--include/configs/luan.h1
-rw-r--r--include/configs/lwmon5.h1
-rw-r--r--include/configs/m53evk.h1
-rw-r--r--include/configs/makalu.h1
-rw-r--r--include/configs/malta.h1
-rw-r--r--include/configs/mecp5123.h1
-rw-r--r--include/configs/meesc.h1
-rw-r--r--include/configs/mpc5121ads.h1
-rw-r--r--include/configs/mv-common.h1
-rw-r--r--include/configs/mvebu_armada-8k.h1
-rw-r--r--include/configs/mvebu_db-88f3720.h1
-rw-r--r--include/configs/mx25pdk.h2
-rw-r--r--include/configs/mx31ads.h1
-rw-r--r--include/configs/mx31pdk.h1
-rw-r--r--include/configs/mx35pdk.h2
-rw-r--r--include/configs/mx51evk.h2
-rw-r--r--include/configs/mx53ard.h1
-rw-r--r--include/configs/mx53cx9020.h1
-rw-r--r--include/configs/mx53evk.h1
-rw-r--r--include/configs/mx53loco.h1
-rw-r--r--include/configs/mx53smd.h1
-rw-r--r--include/configs/mx6cuboxi.h1
-rw-r--r--include/configs/mx6qarm2.h2
-rw-r--r--include/configs/mx6sabre_common.h2
-rw-r--r--include/configs/mx6slevk.h2
-rw-r--r--include/configs/mx6sllevk.h2
-rw-r--r--include/configs/mx6sxsabreauto.h2
-rw-r--r--include/configs/mx6sxsabresd.h2
-rw-r--r--include/configs/mx6ul_14x14_evk.h2
-rw-r--r--include/configs/mx6ullevk.h2
-rw-r--r--include/configs/mx7dsabresd.h2
-rw-r--r--include/configs/mxs.h1
-rw-r--r--include/configs/neo.h1
-rw-r--r--include/configs/nitrogen6x.h1
-rw-r--r--include/configs/novena.h1
-rw-r--r--include/configs/omapl138_lcdk.h1
-rw-r--r--include/configs/ot1200.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h2
-rw-r--r--include/configs/p1_twr.h2
-rw-r--r--include/configs/pcm052.h2
-rw-r--r--include/configs/pcm058.h1
-rw-r--r--include/configs/pico-imx6ul.h2
-rw-r--r--include/configs/picosam9g45.h1
-rw-r--r--include/configs/platinum.h1
-rw-r--r--include/configs/pm9261.h1
-rw-r--r--include/configs/pm9263.h1
-rw-r--r--include/configs/pm9g45.h1
-rw-r--r--include/configs/qemu-ppce500.h1
-rw-r--r--include/configs/rcar-gen2-common.h1
-rw-r--r--include/configs/rcar-gen3-common.h1
-rw-r--r--include/configs/redwood.h1
-rw-r--r--include/configs/s32v234evb.h1
-rw-r--r--include/configs/sama5d2_xplained.h2
-rw-r--r--include/configs/sbc8349.h2
-rw-r--r--include/configs/sbc8548.h2
-rw-r--r--include/configs/sbc8641d.h2
-rw-r--r--include/configs/secomx6quq7.h2
-rw-r--r--include/configs/sequoia.h1
-rw-r--r--include/configs/smartweb.h1
-rw-r--r--include/configs/snapper9g45.h1
-rw-r--r--include/configs/socfpga_sr1500.h2
-rw-r--r--include/configs/som-6896.h1
-rw-r--r--include/configs/som-db5800-som-6867.h1
-rw-r--r--include/configs/spear-common.h1
-rw-r--r--include/configs/stm32f429-discovery.h1
-rw-r--r--include/configs/stm32f746-disco.h2
-rw-r--r--include/configs/strider.h1
-rw-r--r--include/configs/stv0991.h1
-rw-r--r--include/configs/t3corp.h1
-rw-r--r--include/configs/taurus.h1
-rw-r--r--include/configs/tbs2910.h2
-rw-r--r--include/configs/tegra-common.h2
-rw-r--r--include/configs/ti_am335x_common.h3
-rw-r--r--include/configs/ti_armv7_keystone2.h1
-rw-r--r--include/configs/titanium.h1
-rw-r--r--include/configs/tplink_wdr4300.h2
-rw-r--r--include/configs/tqma6.h2
-rw-r--r--include/configs/ts4800.h2
-rw-r--r--include/configs/udoo.h2
-rw-r--r--include/configs/udoo_neo.h1
-rw-r--r--include/configs/usbarmory.h1
-rw-r--r--include/configs/v38b.h1
-rw-r--r--include/configs/ve8313.h2
-rw-r--r--include/configs/vf610twr.h2
-rw-r--r--include/configs/vining_2000.h2
-rw-r--r--include/configs/walnut.h2
-rw-r--r--include/configs/wandboard.h2
-rw-r--r--include/configs/warp.h2
-rw-r--r--include/configs/warp7.h2
-rw-r--r--include/configs/woodburn.h1
-rw-r--r--include/configs/work_92105.h1
-rw-r--r--include/configs/x86-chromebook.h1
-rw-r--r--include/configs/xpedite1000.h1
-rw-r--r--include/configs/xpress.h2
-rw-r--r--include/configs/yosemite.h1
-rw-r--r--include/configs/yucca.h1
210 files changed, 0 insertions, 287 deletions
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index a6f73f2df3e..31976f3bd29 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -198,8 +198,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-
#define CONFIG_SYS_INIT_RAM_LOCK
#define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */
#define CONFIG_SYS_INIT_RAM_SIZE 0x00004000/* End of used area in RAM */
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 8aec315959b..dbd3724a835 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -373,7 +373,6 @@ combinations. this should be removed later
#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3
#endif
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_SYS_INIT_RAM_LOCK
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 55e48e24cba..ff460208420 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -21,8 +21,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
-
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_BAUDRATE 9600
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index fb6e0ef4732..da3edfaa4af 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -24,7 +24,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index f7fc652b4e7..61d6fd080dd 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -246,7 +246,6 @@
/* Size: 0=1MB, 1=2MB, 2=4MB, 3=8MB, 4=16MB, 5=32MB, 6=64MB, 7=128MB */
#define FLASH_SIZE_PRELIM 3 /* maximal flash FLASH size bank #0 */
-#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_BOARD_EARLY_INIT_R
/* Peripheral Bus Mapping */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 4b0b35206cb..64a1467b106 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -78,7 +78,6 @@
#define CONFIG_SYS_CLK_FREQ CONFIG_83XX_CLKIN
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r */
#define CONFIG_SYS_IMMR 0xE0000000
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index bd25c0b4621..2e3e44c20fb 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -77,7 +77,6 @@
#define CONFIG_SYS_SICRH 0x00000000
#define CONFIG_SYS_SICRL 0x00000000 /* 3.3V, no delay */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
#define CONFIG_HWCONFIG
/*
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 12a47b215fb..3bc10aa5329 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -72,7 +72,6 @@
*/
#define CONFIG_SYS_SICRL 0x00000000
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R
/*
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 3d3eeb5f46b..09f052452ee 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -44,8 +44,6 @@
#endif
#endif
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
-
#define CONFIG_SYS_IMMR 0xE0000000
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f86b0088791..a8cb186d24f 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -97,7 +97,6 @@
*/
#define CONFIG_SYS_OBIR 0x31100000
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_HWCONFIG
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d843bd1a752..7754ec72da2 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -18,7 +18,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFE000000
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_HWCONFIG
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index ce3340584cb..9bfaa4bfc2a 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -61,8 +61,6 @@
#define CONFIG_L2_CACHE /* toggle L2 cache */
#define CONFIG_BTB /* toggle branch predition */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
-
#define CONFIG_ENABLE_36BIT_PHYS 1
#ifdef CONFIG_PHYS_64BIT
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 0d3707f82bb..4296ba7f8bb 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -41,8 +41,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_ENABLE_36BIT_PHYS 1
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
-
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x00400000
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 3e00f691ad5..01be54be2f9 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -54,7 +54,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_ENABLE_36BIT_PHYS 1
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R 1
#define CONFIG_HWCONFIG
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index c5f3634979d..11786616358 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -61,7 +61,6 @@
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0)
#endif
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_MISC_INIT_R 1
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index cd9cd9ac564..979a8f1f657 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -504,7 +504,6 @@ extern unsigned long get_sdram_size(void);
#endif
#endif
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_SYS_INIT_RAM_LOCK
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 505b4178a40..1d219a79e2c 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -274,7 +274,6 @@
#endif /* CONFIG_NAND_FSL_ELBC */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_HWCONFIG
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index d8ff10e284b..1ab54123ff9 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -109,7 +109,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f function */
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
#define CONFIG_SYS_INIT_RAM_LOCK
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 3cd5c3c6130..ac579b69b46 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -276,7 +276,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 9589c359efd..cb343e592e7 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -74,8 +74,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 1250000 }
-#define CONFIG_BOARD_EARLY_INIT_F
-
/***********************************************************************
* Last Stage Init
***********************************************************************/
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 3dcb6acc170..35f04ffe418 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -81,7 +81,6 @@
***************************************************************/
#define SPD_EEPROM_ADDRESS 0x50
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/**************************************************************
@@ -205,8 +204,6 @@
/* Size: 0=1MB, 1=2MB, 2=4MB, 3=8MB, 4=16MB, 5=32MB, 6=64MB, 7=128MB */
#define FLASH_SIZE_PRELIM 3 /* maximal flash FLASH size bank #0 */
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Configuration Port location */
#define CONFIG_PORT_ADDR 0xF4000000
#define MULTI_PURPOSE_SOCKET_ADDR 0xF8000000
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 0967577e471..91450624d45 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33333400 /* external frequency to pll */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index d7af4e008cc..71adc110d85 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -13,7 +13,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 2e7f6e48032..d4207d7438a 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -35,7 +35,6 @@
#define CONFIG_4xx_DCACHE /* enable dcache */
#endif
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_F 1
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index c9a1334ca5f..530253fcc6c 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -28,9 +28,6 @@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_DEEP_SLEEP
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 36eba4ec2cc..88094e0e13f 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -33,9 +33,6 @@
#ifdef CONFIG_ARCH_T1024
#define CONFIG_DEEP_SLEEP
#endif
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xrdb/t1024_pbi.cfg
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 8d6d986a491..58bafd25a73 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -40,9 +40,6 @@
/* support deep sleep */
#define CONFIG_DEEP_SLEEP
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xeff40000
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index d574bbbef28..703e1e3049c 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -151,9 +151,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
/* support deep sleep */
#define CONFIG_DEEP_SLEEP
-#if defined(CONFIG_DEEP_SLEEP)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xeff40000
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 708eb766385..405efadfdd3 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -51,7 +51,6 @@
#ifdef CONFIG_FO300
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enable null device */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* used to detect S1 switch position */
#define CONFIG_USB_BIN_FIXUP 1 /* for a buggy USB device */
#if 0
#define FO300_SILENT_CONSOLE_WHEN_S1_CLOSED 1 /* silent console on PSC1 when S1 */
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 68e59900c04..af19a512a1f 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_LCRR_CLKDIV LCRR_CLKDIV_8
/* board pre init: do not call, nothing to do */
-#undef CONFIG_BOARD_EARLY_INIT_F
/* detect the number of flash banks */
#define CONFIG_BOARD_EARLY_INIT_R
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index f32fb4d0417..a0255dcb52b 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -157,8 +157,6 @@
#define CONFIG_L2_CACHE
#define CONFIG_BTB
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-
#define CONFIG_ENABLE_36BIT_PHYS
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 50d24050a42..760a4bedaf7 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFFC8000
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index c10c646f6cd..3e8d48be451 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_CLK_FREQ ((in8(CONFIG_SYS_CPLD_BASE + 0) == 0x0c) ? \
66666666 : 33333000)
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_F 1 /* Call misc_init_f */
#define CONFIG_NO_SERIAL_EEPROM
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index bf87b2bc968..c410544f622 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -33,8 +33,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 966503a6c61..961ad0a0c8b 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -57,9 +57,6 @@
* we need to call board_early_init_f. This is taken care of in
* s_init when we have SPL used.
*/
-#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && !defined(CONFIG_SPL)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
/* Now bring in the rest of the common code. */
#include <configs/ti_armv7_omap.h>
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 03e6e3045eb..840502c5b12 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -20,8 +20,6 @@
#define CONFIG_IODELAY_RECALIBRATION
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_NR_DRAM_BANKS 2
#define CONFIG_ENV_SIZE (64 << 10)
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 2da520eda9d..1253e0a64c2 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -7,8 +7,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MHZ 200
#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index ce64c941d52..99027e078ed 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -7,8 +7,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MHZ 325
#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index db53ef88d56..97c1f1a8ea7 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -36,7 +36,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_MXC_UART
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 56530fd0720..030f01c36dc 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -21,8 +21,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
/* MMC Configs */
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 3775a496a4c..25b88f9798d 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -27,7 +27,6 @@
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_TMU_TIMER
#define CONFIG_SYS_DCACHE_OFF
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 13140bae1f8..42410a8526e 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -24,8 +24,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_ENV_VARS_UBOOT_CONFIG
/* general purpose I/O */
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index ed0daf52769..82e2cb7401e 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -56,8 +56,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#define CONFIG_BOARD_EARLY_INIT_F
-
/*
* Memory Configuration
*/
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index f07366e6537..95499c8764a 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -42,7 +42,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 6806cc7e25f..b8d3791346c 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -41,8 +41,6 @@
#define CONFIG_SYS_USE_NORFLASH
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
-
/*
* Hardware drivers
*/
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 12a92c2871e..743153bb180 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -27,7 +27,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 9c9e809acca..0b8448c4e35 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -27,7 +27,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_AT91_GPIO
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index b5aebe634a1..3f0bb6e974d 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -23,7 +23,6 @@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS 1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 6dee45a9f2b..361830bec09 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -23,7 +23,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 00a8c7970fd..b0c4a05bcc6 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -14,7 +14,6 @@
#define CONFIG_AT32AP7000
#define CONFIG_ATNGW100
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/*
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index d1f61b3243a..eb7e0b2249a 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -16,7 +16,6 @@
#define CONFIG_AT32AP7000
#define CONFIG_ATNGW100MKII
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/*
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 3d17ae12649..2480c3d2171 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -94,7 +94,6 @@
#define CONFIG_BOOTP_GATEWAY
/* generic board */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/*
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 2dd9d312950..58b1850d643 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -38,7 +38,6 @@
* This board might be of different versions so handle it
*/
#define CONFIG_BOARD_TYPES
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* NAND Flash configuration
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 1b22a3717e2..2e8105afd40 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -32,8 +32,6 @@
/* Reclaim some space. */
#undef CONFIG_SYS_LONGHELP
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
-
/*
* Please note that, if NAND support is enabled, the 2nd ethernet port
* can't be used because of pin multiplexing. So, if you want to use the
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index dc7d83f61de..6948e202438 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -78,7 +78,6 @@
/*
* Misc Settings
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ICACHE_OFF
#define CONFIG_DCACHE_OFF
#define CONFIG_UART_CONSOLE 0
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 43e4971b744..05b338ff124 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -135,7 +135,6 @@
/*
* Misc Settings
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index b79aa2bd304..81d5af60466 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -158,7 +158,6 @@
/*
* Misc Settings
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_SIZE_LIMIT $$(( 512 * 1024 ))
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 337bb0a5802..55127c58a89 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -132,7 +132,6 @@
/*
* Misc Settings
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_UART_CONSOLE 0
#define CONFIG_CMD_SOFTSWITCH
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index c9890239b74..8a5994af51d 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -28,8 +28,6 @@
#define CONFIG_HOSTNAME bubinga
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
-
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
#define CONFIG_NO_SERIAL_EEPROM
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 1d189d22a18..ca4d6ecaeef 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -47,7 +47,6 @@
#define CONFIG_SYS_CLK_FREQ 66666667 /* external freq to pll */
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_early_init_r */
#define CONFIG_MISC_INIT_R /* Call misc_init_r */
#define CONFIG_BOARD_TYPES /* support board types */
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index a34f6b9b23b..c32372a66ce 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -26,7 +26,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_MXC_UART
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index c5b82f748e9..02a46cae3d8 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -102,7 +102,6 @@
* Misc Settings
*/
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
#define CONFIG_BOOTCOMMAND "run flashboot"
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index cd870463b9b..ca94fab4c05 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -34,7 +34,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_MXC_UART
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 69b0ae77019..56a6f1ed4f2 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -20,7 +20,6 @@
#define PHYS_SDRAM_SIZE SZ_512M
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index d2d4330ddc1..3f36d6a522f 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -31,8 +31,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_VARS_UBOOT_CONFIG
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 9a71dda54c1..12e6eb2e493 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -14,7 +14,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ARCH_MISC_INIT
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 17360978fce..d236f3a0200 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -357,14 +357,12 @@
/*
* Board initialisation callbacks
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
#else /* CONFIG_TRAILBLAZER */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index c9c00c5388f..7a3de316069 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -285,7 +285,6 @@
#define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index e6a52d8b571..ec7e3029f62 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -36,7 +36,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 2e9fa075de2..5f4800bdac2 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -10,7 +10,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (2 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SMSC_SIO1007
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 506b22790ec..219944ae19c 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -14,7 +14,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SMSC_LPC47M
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 14e207e9351..71a55d8ccd2 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -164,7 +164,6 @@
#define CONFIG_SYS_RAMBOOT
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 0ad6e4c1633..e1f9b901711 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -249,7 +249,6 @@
* U-Boot general configuration
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index a71f67c352b..c04146ffcd4 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -24,7 +24,6 @@
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* Memory configurations
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 727baae061e..211c9ea130c 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -14,7 +14,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#ifndef CONFIG_INTERNAL_UART
/* Use BayTrail internal HS UART which is memory-mapped */
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index a5384a235b9..6b3cd15cb65 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -19,7 +19,6 @@
#define CONFIG_HOSTNAME dlvsion-10g
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index 57640da3255..6269768df1a 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -19,7 +19,6 @@
#define CONFIG_HOSTNAME dlvision
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */
#define CONFIG_MISC_INIT_R /* call misc_init_r */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index c51961736e1..da458a47b48 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -15,7 +15,6 @@
#include <environment/ti/dfu.h>
#define CONFIG_DRA7XX
-#define CONFIG_BOARD_EARLY_INIT_F
#ifdef CONFIG_SPL_BUILD
#define CONFIG_IODELAY_RECALIBRATION
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 27654c8bdbb..8319dc4d341 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_USE_NAND
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_PREBOOT
/*
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 9cc62ed452f..774d3296ab2 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -223,8 +223,6 @@
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ep93xx-ohci"
#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x80020000
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Define to disable flash configuration*/
/* #define CONFIG_EP93XX_NO_FLASH_CFG */
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index c124abe542a..484565c9aa9 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -19,8 +19,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#ifdef CONFIG_SPL
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index d9709249f60..48c9e0b3e9b 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -24,8 +24,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
/* I2C Configs */
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index cdbe154839d..978495527dd 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -18,7 +18,6 @@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* Keep L2 Cache Disabled */
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 1cea74e9542..4d73b9331f0 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -18,7 +18,6 @@
#include <linux/sizes.h>
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* Size of malloc() pool before and after relocation */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 0f7b3c82dbe..96a2a80aca4 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -31,7 +31,6 @@
#define CONFIG_SYS_TEXT_BASE 0xA0000000
/* This is required to setup the ESDC controller */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_REVISION_TAG
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 360f3797288..1094143cb0a 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -14,7 +14,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ARCH_MISC_INIT
/* ns16550 UART is memory-mapped in Quark SoC */
diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h
index 12bf95f5ddb..fee46add809 100644
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -30,7 +30,6 @@
*/
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f*/
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
/*
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index e8de711755b..91712c178db 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -44,8 +44,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index f1afdedb3c0..b727314c907 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -62,7 +62,6 @@
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/* User serviceable stuff */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 8f6d9bb8734..24e31506207 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
/* Init Functions */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
/* Driver Model */
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 4048bce77cc..0f6f11755dd 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -21,8 +21,6 @@
#define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Physical Memory Map */
/* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index b2247060409..079c4cfdcc6 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFE000000
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/icon.h b/include/configs/icon.h
index b15016b5a34..29d33650c13 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -30,7 +30,6 @@
#define CONFIG_HOSTNAME icon
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_early_init_r */
/*
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index de333e94c23..5d0702f6838 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -118,7 +118,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 0x80000000
#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_TEXT_BASE 0xA0000000
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
diff --git a/include/configs/intip.h b/include/configs/intip.h
index e61005be1ca..5c8b68dfa58 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -40,7 +40,6 @@
#define CONFIG_SYS_CLK_FREQ 66666667 /* external freq to pll */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/io.h b/include/configs/io.h
index 8c9ee0e1ae1..8a21b3f60f7 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -19,7 +19,6 @@
#define CONFIG_HOSTNAME io
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/io64.h b/include/configs/io64.h
index 7f2cbd51f5d..8619de4af9a 100644
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -38,7 +38,6 @@
#define CONFIG_HOSTNAME io64
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index 87f56f187b4..9c3be78bc73 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -22,7 +22,6 @@
/* Reclaim some space. */
#undef CONFIG_SYS_LONGHELP
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 991dad1ce35..74dad5fc2d2 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -198,7 +198,6 @@
* U-Boot general configuration
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e0735286337..26cbd6df3bf 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
#define CONFIG_BOARD_EARLY_INIT_R 1
-#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index a41c127b08e..0ddd6c4596a 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -37,7 +37,6 @@
#define CONFIG_HOSTNAME katmai
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#undef CONFIG_SHOW_BOOT_PROGRESS
/*-----------------------------------------------------------------------
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 2254eca5a4c..43eb405e638 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -46,7 +46,6 @@
#define CONFIG_HOSTNAME kilauea
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_BOARD_TYPES
#define CONFIG_BOARD_EMAC_COUNT
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index bcde7681ab3..9dfb0510b58 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -305,7 +305,6 @@ int get_scl(void);
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* Do early setups now in board_init_f() */
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* resereved pram area at the end of memroy [hex]
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index b4cdb67a514..37be3395738 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -199,7 +199,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_BOOTCOUNT_LIMIT
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
#define CONFIG_MISC_INIT_F
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 9402aca1bc7..2e672b35eb5 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -18,7 +18,6 @@
#include <asm/arch/rmobile.h>
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 402dab2915d..bd4135e891b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -142,7 +142,6 @@
/*
* U-Boot general configuration
*/
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 1f5dba2df49..2ce39ffecf9 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -19,8 +19,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index eddfa1493e1..81f8d6263e5 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_CLK_FREQ 125000000
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 69ba8bff060..3daa3450b47 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -13,8 +13,6 @@
#define CONFIG_SYS_FSL_CLK
-#define CONFIG_BOARD_EARLY_INIT_F
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 031dce7604f..fc41ea15b83 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_FSL_CLK
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DEEP_SLEEP
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 1f179f40c8d..b97ee343432 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_FSL_CLK
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DEEP_SLEEP
/*
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 66805c2d7af..74278de047e 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -21,7 +21,6 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_VERY_BIG_RAM
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 5ac89380e56..965d6c94510 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -20,7 +20,6 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_VERY_BIG_RAM
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 99c0661b904..851db612d7c 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -40,7 +40,6 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F 1
#ifndef CONFIG_SPL
#define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 2ab6f583649..f4a63de088e 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -28,7 +28,6 @@
#define CONFIG_HOSTNAME luan
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
/*-----------------------------------------------------------------------
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 638682f392b..658e359b20f 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -25,7 +25,6 @@
#define CONFIG_4xx_DCACHE /* enable cache in SDRAM */
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_early_init_r */
#define CONFIG_BOARD_POSTCLK_INIT /* Call board_postclk_init */
#define CONFIG_MISC_INIT_R /* Call misc_init_r */
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 8ec98fd6337..22397773d5e 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -13,7 +13,6 @@
#include <asm/arch/imx-regs.h>
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_FSL_CLK
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index 7c358bc8e85..42fdb370a78 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -31,7 +31,6 @@
#define CONFIG_ADDMISC "addmisc=setenv bootargs ${bootargs} rtc-x1205.probe=0,0x6f\0"
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
/*-----------------------------------------------------------------------
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 65cd3218a05..103360d2480 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -11,7 +11,6 @@
* System configuration
*/
#define CONFIG_MALTA
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MEMSIZE_IN_BYTES
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 4f90c34da16..c9dbc5ab72c 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -35,7 +35,6 @@
#define CONFIG_SYS_MPC512X_CLKIN 33333333 /* in Hz */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_IMMR 0x80000000
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 6b9bb6a5297..5356e4c43aa 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -44,7 +44,6 @@
/* Misc CPU related */
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SERIAL_TAG
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index c36141a0076..0159da4a212 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -49,7 +49,6 @@
#define CONFIG_SYS_MPC512X_CLKIN 33333333 /* in Hz */
#endif
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_IMMR 0x80000000
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index b28030caf91..d7fbe963a91 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -85,7 +85,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
#define CONFIG_SYS_MEMTEST_END 0x00ffffff /*(_16M -1) */
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index fd185321d16..27dc6282d4e 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -53,7 +53,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
#define CONFIG_SYS_MEMTEST_END 0x00ffffff /*(_16M -1) */
diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index 7fc3dcc7905..caaad862216 100644
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -51,7 +51,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
#define CONFIG_SYS_MEMTEST_END 0x00ffffff /*(_16M -1) */
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 1484762b775..c818d3e2c5f 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -35,8 +35,6 @@
#define PHYS_SDRAM_1 0x80000000
#define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_RAM_ADDR IMX_RAM_BASE
#define CONFIG_SYS_INIT_RAM_SIZE IMX_RAM_SIZE
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 28fa51327e9..ce4936d01c0 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -121,7 +121,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 CSD0_BASE
#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 36716a982f2..e351f05c069 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -117,7 +117,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 CSD0_BASE
#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index a75cd25b3b6..22bfa147d2b 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -23,8 +23,6 @@
/* Set TEXT at the beginning of the NOR flash */
#define CONFIG_SYS_TEXT_BASE 0xA0000000
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_REVISION_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ea738726f10..56650ba1993 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -212,8 +212,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 \
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index d84d524deb1..28b3738144a 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -25,7 +25,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 7d84f51da37..6656f1306c4 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -24,7 +24,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_REVISION_TAG
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 62d153cd921..76136a89455 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -25,7 +25,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 313f4dfd0aa..96c4b4f912a 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -25,7 +25,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_REVISION_TAG
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index ad4964c182c..18dfa71d21c 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -25,7 +25,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index dfd37cdc456..2782911da3e 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -16,7 +16,6 @@
#define CONFIG_IMX_THERMAL
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_UART
/* MMC Configs */
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 4e404832696..9f427355719 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -14,8 +14,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART4_BASE
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index d2a584a5805..a2ab77a727c 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -16,8 +16,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
/* MMC Configs */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 501d7de5448..e54982af2e8 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -21,8 +21,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 8f565410127..8215e63baac 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -20,8 +20,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 0ba1e14a389..90a935bbd07 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -14,8 +14,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index d423880420d..aff7a245873 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -18,8 +18,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 2faa10c55d7..f84bff9ff4c 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -23,8 +23,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index b8eddf1da62..b56482427f0 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -27,8 +27,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 7e172e0b075..4aa360288ab 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -19,8 +19,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Network */
#define CONFIG_FEC_MXC
#define CONFIG_MII
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index b26bc01977f..a225a96f7a4 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -42,7 +42,6 @@
*/
/* Startup hooks */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ARCH_MISC_INIT
/* SPL */
diff --git a/include/configs/neo.h b/include/configs/neo.h
index 8b6ee92f665..f6b4cc01c28 100644
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -19,7 +19,6 @@
#define CONFIG_HOSTNAME neo
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c22fed70a41..ca55063f77c 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -17,7 +17,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_USBD_HS
#define CONFIG_USB_ETHER
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 63fc59a1827..5a07bf38912 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -10,7 +10,6 @@
#define __CONFIG_H
/* System configurations */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_KEYBOARD
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 43da339f397..65354b0eade 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -246,7 +246,6 @@
* U-Boot general configuration
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "zImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index f4b3e06f923..6704e973dea 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -13,7 +13,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
/* UART Configs */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index f91a7628d86..c8d5e893385 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -291,8 +291,6 @@
#define CONFIG_L2_CACHE
#define CONFIG_BTB
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-
#define CONFIG_ENABLE_36BIT_PHYS
#ifdef CONFIG_PHYS_64BIT
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 63825b0bde7..041e016f52e 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -71,8 +71,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_L2_CACHE
#define CONFIG_BTB
-#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x1fffffff
#define CONFIG_PANIC_HANG /* do not reset board on panic */
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index f3cf95469a2..182f22e147c 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -23,8 +23,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 5f649537d16..098b02afa81 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -29,7 +29,6 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
/* Early setup */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_BOARDINFO_LATE
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 2bd70764990..6b0c5466968 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -27,8 +27,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 20fb0366f36..bf817d7becd 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -30,7 +30,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index f3ac4589aa0..2610e243e72 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -117,7 +117,6 @@
*/
/* Board startup config */
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index c19e7dc9f3b..92547224226 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -138,7 +138,6 @@
#define CONFIG_INITRD_TAG 1
#undef CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index eddc81a8bdd..ac1f7fbb53b 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -151,7 +151,6 @@
#undef CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_USER_LOWLEVEL_INIT 1
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 28690c28faa..2ed977c29cb 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -40,7 +40,6 @@
#define CONFIG_INITRD_TAG 1
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 9517674010b..9f267877ab4 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -36,7 +36,6 @@
#define CONFIG_PANIC_HANG /* do not reset board on panic */
/* Needed to fill the ccsrbar pointer */
-#define CONFIG_BOARD_EARLY_INIT_F
/* Virtual address to CCSRBAR */
#define CONFIG_SYS_CCSRBAR 0xe0000000
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 459b077fb3e..1338cd3469b 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -34,7 +34,6 @@
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_TMU_TIMER
#define CONFIG_SH_GPIO_PFC
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index ec4d54ed977..930f2d5f3cf 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -43,7 +43,6 @@
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SH_GPIO_PFC
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 72fbf108fa4..9f8f60c2c17 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -14,7 +14,6 @@
*----------------------------------------------------------------------*/
#define CONFIG_440 1 /* ... PPC460 family */
#define CONFIG_460SX 1 /* ... PPC460 family */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_SYS_TEXT_BASE 0xfffb0000
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 9ee68dde7bd..4d048ba28b3 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -61,7 +61,6 @@
#else
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DM_SERIAL
#define CONFIG_FSL_LINFLEXUART
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 4f72c83d6b1..49b0419e9a7 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -15,8 +15,6 @@
#include "at91-sama5_common.h"
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MISC_INIT_R
/* SDRAM */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index ca1797d0939..ca5e64fd9b4 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -50,8 +50,6 @@
#endif
#endif
-#undef CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
-
#define CONFIG_SYS_IMMR 0xE0000000
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 281a9938c41..f5a5b619405 100644
--- 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
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index f02634b1a27..30eb114812c 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -75,8 +75,6 @@
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0)
#endif
-#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 region */
#define CONFIG_SYS_MEMTEST_END 0x00400000
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 51b88a485b6..a5de46ac1c8 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -16,8 +16,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index ed8a51c6633..a913cbf7ca3 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -54,7 +54,6 @@
#define CONFIG_4xx_DCACHE /* enable dcache */
#endif
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
/*
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index fd35f71f913..5ecc693fc84 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -46,7 +46,6 @@
#define CONFIG_SETUP_MEMORY_TAGS /* pass memory defs to kernel */
#define CONFIG_INITRD_TAG /* pass initrd param to kernel */
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* U-Boot is loaded by a bootloader */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
/* We set the max number of command args high to avoid HUSH bugs. */
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 6acc82ce9a5..8cfdcdea127 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -26,7 +26,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_BOARD_EARLY_INIT_F
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 0407f03969f..424cada1570 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -8,8 +8,6 @@
#include <asm/arch/base_addr_ac5.h>
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_NO_FLASH
#define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
index ba11b2061a0..af51c2a94b1 100644
--- a/include/configs/som-6896.h
+++ b/include/configs/som-6896.h
@@ -14,7 +14,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_SCSI_DEV_LIST \
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index e13f3437513..ec1b6acc028 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -14,7 +14,6 @@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ARCH_MISC_INIT
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 912b7764098..77b80df2a63 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -172,7 +172,6 @@
/* Miscellaneous configurable options */
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOT_PARAMS_ADDR 0x00000100
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 6b356411026..69135ff0f61 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -11,7 +11,6 @@
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_STM32F4DISCOVERY
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_FLASH_BASE 0x08000000
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 4391bff1cc8..b4a8f410148 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -11,8 +11,6 @@
#define CONFIG_SYS_THUMB_BUILD
/*#define CONFIG_SYS_NO_FLASH*/
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_FLASH_BASE 0x08000000
#define CONFIG_SYS_INIT_SP_ADDR 0x20050000
#define CONFIG_SYS_TEXT_BASE 0x08000000
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 3be25976a48..a038ded2ae7 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFE000000
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 09a3064bd6d..0e7d8608a26 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -9,7 +9,6 @@
#define __CONFIG_STV0991_H
#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_CORTEX_R4
diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h
index e0c76749891..d3f20507361 100644
--- a/include/configs/t3corp.h
+++ b/include/configs/t3corp.h
@@ -30,7 +30,6 @@
#define CONFIG_SYS_CLK_FREQ 66666667 /* external freq to pll */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index ab457da2a00..0b07e30fa04 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -46,7 +46,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_BOARD_EARLY_INIT_F
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 0dc4a28a430..3b56be8b0b3 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -16,8 +16,6 @@
#define CONFIG_MACH_TYPE 3980
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_HZ 1000
#define CONFIG_IMX_THERMAL
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 65286241089..8bdfade2e9d 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -104,8 +104,6 @@
CONFIG_SPL_TEXT_BASE)
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Misc utility code */
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_CRC32_VERIFY
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 809d015cf93..c0e4336eb07 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -75,9 +75,6 @@
* we need to call board_early_init_f. This is taken care of in
* s_init when we have SPL used.
*/
-#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && !defined(CONFIG_SPL)
-#define CONFIG_BOARD_EARLY_INIT_F
-#endif
#ifdef CONFIG_NAND
#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 28a80f52675..f88501505fc 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -14,7 +14,6 @@
/* U-Boot Build Configuration */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage loader */
-#define CONFIG_BOARD_EARLY_INIT_F
/* SoC Configuration */
#define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index bbdaf0443d9..a53969f74fa 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -23,7 +23,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_MXC_UART
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index fefc9023601..6f780bc0b04 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -7,8 +7,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_MHZ 280
#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index a35d292f164..09783a2ca05 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -32,8 +32,6 @@
#define PHYS_SDRAM_SIZE (1024u * SZ_1M)
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
/* SPI */
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 261daef9aa3..ac8c59f4f22 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -148,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 \
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 05687dda4a7..961062178d2 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -19,8 +19,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 94a38d1264e..9835ce88753 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -18,7 +18,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_UART
/* MMC Configuration */
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 904b7727a8a..b32cd6a3916 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -13,7 +13,6 @@
#define CONFIG_MX53
#define CONFIG_SYS_FSL_CLK
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO
#define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 7d013232b64..1f48a41589c 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -27,7 +27,6 @@
#define CONFIG_NETCONSOLE 1
#define CONFIG_BOARD_EARLY_INIT_R 1 /* do board-specific init */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* do board-specific init */
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_XLB_PIPELINING 1 /* gives better performance */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index e293f12b4e4..564607e516f 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -28,8 +28,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE 1
#define CONFIG_FSL_ELBC 1
-#define CONFIG_BOARD_EARLY_INIT_F 1
-
/*
* On-board devices
*
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index f122c9886f9..a8cd96b02ea 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -30,8 +30,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 1aca9d29006..0ff0a16171a 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -18,8 +18,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 2edc0b0e8e6..c48a6ae4457 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -29,8 +29,6 @@
#define CONFIG_HOSTNAME walnut
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
-
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
/*
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 125c74ed1e9..d337979f7c4 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -20,8 +20,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 90ff9417c6b..865f2ac81c7 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -18,8 +18,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 10c20e77b37..4528f094ce3 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -18,8 +18,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* MMC Config*/
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
#define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/woodburn.h b/include/configs/woodburn.h
index c14f7d47d06..f3bc7194047 100644
--- a/include/configs/woodburn.h
+++ b/include/configs/woodburn.h
@@ -16,6 +16,5 @@
/* Set TEXT at the beginning of the NOR flash */
#define CONFIG_SYS_TEXT_BASE 0xA0000000
-#define CONFIG_BOARD_EARLY_INIT_F
#endif /* __CONFIG_H */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index b08641fcf0d..33e2b98bb5c 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -26,7 +26,6 @@
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/* generate LPC32XX-specific SPL image */
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 545cffbfaa2..e8ad29d3d09 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -9,7 +9,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_X86_MRC_ADDR 0xfffa0000
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index bfe68f01d10..45436c8ac0e 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_FORM_PMC 1
#define CONFIG_440 1
#define CONFIG_440GX 1 /* 440 GX */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 2dc57e91241..ce355bf671b 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -17,8 +17,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (16 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index a355112ab68..c77967b1d3e 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -32,7 +32,6 @@
*/
#include "amcc-common.h"
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_BOARD_RESET 1 /* call board_reset() */
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 0a3e4b3bea4..183bfce2af1 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -21,7 +21,6 @@
#define CONFIG_440 1 /* ... PPC440 family */
#define CONFIG_440SPE 1 /* Specifc SPe support */
#define CONFIG_440SPE_REVA 1 /* Support old Rev A. */
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */
#define EXTCLK_33_33 33333333
#define EXTCLK_66_66 66666666