]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: at91: Drop unnecessary BOARD_EARLY_INIT_F usage
authorTom Rini <trini@konsulko.com>
Wed, 25 Mar 2026 19:00:24 +0000 (13:00 -0600)
committerEugen Hristev <ehristev@kernel.org>
Fri, 1 May 2026 07:00:13 +0000 (10:00 +0300)
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 <trini@konsulko.com>
27 files changed:
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/spl_atmel.c
board/atmel/at91sam9260ek/at91sam9260ek.c
board/atmel/at91sam9261ek/at91sam9261ek.c
board/atmel/at91sam9263ek/at91sam9263ek.c
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
board/atmel/at91sam9n12ek/at91sam9n12ek.c
board/atmel/at91sam9rlek/at91sam9rlek.c
board/atmel/at91sam9x5ek/at91sam9x5ek.c
board/atmel/sam9x60_curiosity/sam9x60_curiosity.c
board/atmel/sam9x60ek/sam9x60ek.c
board/atmel/sam9x75_curiosity/sam9x75_curiosity.c
board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
board/atmel/sama5d2_icp/sama5d2_icp.c
board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
board/atmel/sama5d2_xplained/sama5d2_xplained.c
board/atmel/sama5d3_xplained/sama5d3_xplained.c
board/atmel/sama5d3xek/sama5d3xek.c
board/atmel/sama5d4_xplained/sama5d4_xplained.c
board/atmel/sama5d4ek/sama5d4ek.c
board/atmel/sama7d65_curiosity/sama7d65_curiosity.c
board/atmel/sama7g5ek/sama7g5ek.c
board/ronetix/pm9261/pm9261.c
board/ronetix/pm9263/pm9263.c
configs/pm9261_defconfig
configs/pm9263_defconfig

index 7d00f1650b424b1078947013f7761f49fa850eca..65e9d70f08406ad4539ff4a5c4c8abfe99918298 100644 (file)
@@ -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
 
index 7bfbadf0483ea9ada3bbf8ffae480e6a71d5b70a..32cf78b3bf6bdb6cdbce2e5712a078a4a6a86d98 100644 (file)
@@ -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();
 
index 48aec652c4a43cd74b85d36f97aa0b63d4f6f5d0..07fbafba43353c635ebd9f593dd3e9ba900198b4 100644 (file)
@@ -71,13 +71,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* adress of boot parameters */
index 5d7a18379fae89c298c09a4cbb86c8341b3bf79e..eb5d98ad566cb4e4c476bdeefc1fde341bfe5e17 100644 (file)
@@ -139,13 +139,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
 #ifdef CONFIG_AT91SAM9G10EK
index 2b0b01798eae978b9ca498118469e54b4b7ee4a0..3b272e3ffa1f34fe0f2638f4b83e4801fa82dff6 100644 (file)
@@ -83,13 +83,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* arch number of AT91SAM9263EK-Board */
index d94904366eda8f020ae7ea8ffc663de512e6b72d..d07b5196bc32c444353df0c694c959104d05ad30 100644 (file)
@@ -155,13 +155,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* arch number of AT91SAM9M10G45EK-Board */
index 2cddc2175acce48c730681299609af8bec6f017d..6105e51c9ec3c08a143217616b56dc8eb6f4c357 100644 (file)
@@ -89,13 +89,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* adress of boot parameters */
index 214e917381e732b24cc5ab0fe3d0aff118a19d66..d21dfea50f32b8f52d6e44e347b2b68ce428e69b 100644 (file)
@@ -81,13 +81,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* arch number of AT91SAM9RLEK-Board */
index 3f41fb1c9832f6946d257ec3839c718c121182a4..0cbb50a0621c270bc75e17309cbe630d06d13f0b 100644 (file)
@@ -102,13 +102,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* arch number of AT91SAM9X5EK-Board */
index 3393478e4c8c6785caadab29284f84f449cb414f..43797d625e93da5eecd2a9644645d5b375a38f6f 100644 (file)
@@ -51,11 +51,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 #define MAC24AA_MAC_OFFSET     0xfa
 
 #ifdef CONFIG_MISC_INIT_R
index 2e5073f02b3e0d17e73f8ba27f491c00e135cd5e..64354e5b5fcf64b97c3ac061319f9c68fe72cf7b 100644 (file)
@@ -49,13 +49,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 #define MAC24AA_MAC_OFFSET     0xfa
 
 #ifdef CONFIG_MISC_INIT_R
index 4e7c5667e2147bdfcc210f81dc082466f658b526..364b6a3e24bcda41959db1710ba8f6f724121529 100644 (file)
@@ -42,11 +42,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_init(void)
 {
        /* address of boot parameters */
index bf54fc33df4baacbcf273be57a6f69008ed98c2d..858061bf9f930cb3e774245cc3d2cab9487cb852 100644 (file)
@@ -61,13 +61,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* address of boot parameters */
index 897fab58ebae3ca258f3815d012eec3b6df1d8c7..19341d325bde597ba6a78758b4337bacce750fd1 100644 (file)
@@ -55,13 +55,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* address of boot parameters */
index 113bd2feb62164b6976d9b94599f10dfac0db3a9..d159ad6f4ca38e37fa272cb6138488cd701f6c4d 100644 (file)
@@ -46,11 +46,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_init(void)
 {
        /* address of boot parameters */
index 438829df82d5d2bfb40bbc20d1ab389d4aa253eb..29fa88ff411d6273d18306b43381c9484870465b 100644 (file)
@@ -105,13 +105,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* address of boot parameters */
index eca5b2bf1076c6d4bed2a95f1057253dd521b664..c0862f586061f9f99213a3595f6d1dc0a10a1dba 100644 (file)
@@ -60,13 +60,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* address of boot parameters */
index 7a813c19ff207423e88f0df849aeebd4be95ac00..e12f2883cec64761ec2ae70cf0032fcab08136ec 100644 (file)
@@ -84,13 +84,6 @@ int board_late_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* adress of boot parameters */
index 555a8c0970b0b405a9aea3c9863f91cb6247fbef..405c9c50321b2f9e8db826ff53c7eff9551361f1 100644 (file)
@@ -137,13 +137,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* adress of boot parameters */
index e296b0466aa3b3b831b920a0daeec21b121de579..5894e7a654df342eca46265eabc67c1e7693d2d2 100644 (file)
@@ -99,13 +99,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 #define AT24MAC_MAC_OFFSET     0x9a
 
 #ifdef CONFIG_MISC_INIT_R
index e820605d3b96a3e97204eeeec605a76bb1249dbc..7418369c5ba6054cc65a713c7964f2d856551774 100644 (file)
@@ -97,13 +97,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
-       return 0;
-}
-#endif
-
 int board_init(void)
 {
        /* adress of boot parameters */
index 713b1b9d95919b156778aa2485d36f53692ad54b..764c8f035c9e65fb8b5532d9bb60202f7f3105b5 100644 (file)
@@ -49,11 +49,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_init(void)
 {
        /* address of boot parameters */
index c07115a2119527e9335b3eb05689b3ad2eb05ac8..5409ed2375dd289b46ae24ea53cf44a868a666af 100644 (file)
@@ -46,11 +46,6 @@ void board_debug_uart_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 #define MAC24AA_MAC_OFFSET     0xfa
 
 #if (IS_ENABLED(CONFIG_MISC_INIT_R))
index ee578749bce77f996c83156289474ee24f89ebd9..1f78654b685a43761524fa8f1412d5442d5f2c7c 100644 (file)
@@ -76,11 +76,6 @@ static void pm9261_nand_hw_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_init(void)
 {
        /* arch number of PM9261-Board */
index 8125f064cf115f332814f8994e7c465601e456e0..cc58e0f3a386df7f9e2c05bdbca93ea4a1ff426a 100644 (file)
@@ -70,11 +70,6 @@ static void pm9263_nand_hw_init(void)
 }
 #endif
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_init(void)
 {
        /* arch number of PM9263 Board */
index 026c6de3109cdad5c069f3ddbdb044209de4c712..71cc51004e7dac4118cdd83308b67f9aea27696f 100644 (file)
@@ -23,7 +23,6 @@ CONFIG_SYS_PBSIZE=281
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="pm9261> "
 # CONFIG_CMD_BDI is not set
index cc375671f666395a8c3f353b7ea70e5350c699cf..810c2464e28101d4318b160c8e3fb36a708888dc 100644 (file)
@@ -22,7 +22,6 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=288
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="u-boot-pm9263> "
 # CONFIG_CMD_BDI is not set