arm: at91: Drop unnecessary BOARD_EARLY_INIT_F usage

All of these platforms enable CONFIG_BOARD_EARLY_INIT_F and then have a
do-nothing board_early_init_f function. Change to not enabling the
option and so not needing an empty function.

Signed-off-by: Tom Rini <[email protected]>

2 files changed, 2 insertions, 22 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 7d00f1650b4..65e9d70f084 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -78,7 +78,6 @@ choice
 config TARGET_AT91SAM9260EK
 	bool "Atmel at91sam9260 reference board"
 	select AT91SAM9260
-	select BOARD_EARLY_INIT_F
 
 config TARGET_GURNARD
 	bool "Support gurnard"
@@ -96,7 +95,6 @@ config TARGET_GURNARD
 config TARGET_AT91SAM9261EK
 	bool "Atmel at91sam9261 reference board"
 	select AT91SAM9261
-	select BOARD_EARLY_INIT_F
 
 config TARGET_PM9261
 	bool "Ronetix pm9261 board"
@@ -105,7 +103,6 @@ config TARGET_PM9261
 config TARGET_AT91SAM9263EK
 	bool "Atmel at91sam9263 reference board"
 	select AT91SAM9263
-	select BOARD_EARLY_INIT_F
 
 config TARGET_USB_A9263
 	bool "Caloa USB A9260 board"
@@ -119,7 +116,6 @@ config TARGET_PM9263
 config TARGET_AT91SAM9M10G45EK
 	bool "Atmel AT91SAM9M10G45-EK board"
 	select AT91SAM9M10G45
-	select BOARD_EARLY_INIT_F
 	select SUPPORT_SPL
 
 config TARGET_PM9G45
@@ -129,18 +125,15 @@ config TARGET_PM9G45
 config TARGET_AT91SAM9N12EK
 	bool "Atmel AT91SAM9N12-EK board"
 	select AT91SAM9N12
-	select BOARD_EARLY_INIT_F
 	select SUPPORT_SPL
 
 config TARGET_AT91SAM9RLEK
 	bool "Atmel at91sam9rl reference board"
 	select AT91SAM9RL
-	select BOARD_EARLY_INIT_F
 
 config TARGET_AT91SAM9X5EK
 	bool "Atmel AT91SAM9X5-EK board"
 	select AT91SAM9X5
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 
@@ -154,31 +147,26 @@ config TARGET_GARDENA_SMART_GATEWAY_AT91SAM
 config TARGET_SAM9X60EK
 	bool "SAM9X60-EK board"
 	select SAM9X60
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 
 config TARGET_SAM9X60_CURIOSITY
         bool "SAM9X60 CURIOSITY board"
         select SAM9X60
-        select BOARD_EARLY_INIT_F
         select BOARD_LATE_INIT
 
 config TARGET_SAM9X75_CURIOSITY
 	bool "SAM9X75 CURIOSITY board"
 	select SAM9X7
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	imply OF_UPSTREAM
 
 config TARGET_SAMA5D2_PTC_EK
 	bool "SAMA5D2 PTC EK board"
-	select BOARD_EARLY_INIT_F
 	select SAMA5D2
 	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D2_XPLAINED
 	bool "SAMA5D2 Xplained board"
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SAMA5D2
 	select SUPPORT_SPL
@@ -186,7 +174,6 @@ config TARGET_SAMA5D2_XPLAINED
 config TARGET_SAMA5D27_SOM1_EK
 	bool "SAMA5D27 SOM1 EK board"
 	select SAMA5D2
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select SUPPORT_SPL
@@ -201,7 +188,6 @@ config TARGET_SAMA5D27_SOM1_EK
 config TARGET_SAMA5D27_WLSOM1_EK
 	bool "SAMA5D27 WLSOM1 EK board"
 	select SAMA5D2
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select SUPPORT_SPL
@@ -228,7 +214,6 @@ config TARGET_SAMA5D2_ICP
 	bool "SAMA5D2 Industrial Connectivity Platform (ICP)"
 	select SAMA5D2
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	help
 	  The SAMA5D2 ICP embeds SAMA5D27 rev. C SoC, together with
@@ -248,28 +233,24 @@ config TARGET_SAMA5D29_CURIOSITY
 
 config TARGET_SAMA5D3_XPLAINED
 	bool "SAMA5D3 Xplained board"
-	select BOARD_EARLY_INIT_F
 	select SAMA5D3
 	select SUPPORT_SPL
 	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D3XEK
 	bool "SAMA5D3X-EK board"
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SAMA5D3
 	select SUPPORT_SPL
 
 config TARGET_SAMA5D4_XPLAINED
 	bool "SAMA5D4 Xplained board"
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SAMA5D4
 	select SUPPORT_SPL
 
 config TARGET_SAMA5D4EK
 	bool "SAMA5D4 Evaluation Kit"
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SAMA5D4
 	select SUPPORT_SPL
@@ -291,7 +272,6 @@ config TARGET_CORVUS
 config TARGET_SAMA7G5EK
        bool "SAMA7G5 EK board"
        select SAMA7G5
-       select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
 
 config TARGET_SAMA7G54_CURIOSITY
@@ -307,7 +287,6 @@ config TARGET_SAMA7G54_CURIOSITY
 config TARGET_SAMA7D65_CURIOSITY
 	bool "SAMA7D65 CURIOSITY board"
 	select SAMA7D65
-	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	imply OF_UPSTREAM
 
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 7bfbadf0483..32cf78b3bf6 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -132,7 +132,8 @@ void board_init_f(ulong dummy)
 
 	timer_init();
 
-	board_early_init_f();
+	if (IS_ENABLED(CONFIG_BOARD_EARLY_INIT_F))
+		board_early_init_f();
 
 	at91_mem_init();