mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
Merge tag 'u-boot-at91-fixes-2026.07-a' of https://source.denx.de/u-boot/custodians/u-boot-at91
First set of u-boot-at91 fixes for the 2026.07 cycle: - Cleanup some useless code
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user