arm: mvebu: turris_omnia: don't guard by CONFIG_SPL_BUILD macro

We do not need to guard code in board_init() and board_late_init()
functions with the CONFIG_SPL_BUILD macro, since these functions are not
called in SPL.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún 2021-08-16 15:19:38 +02:00 committed by Stefan Roese
parent dc595e3e45
commit 008a069b89

View File

@ -129,7 +129,6 @@ static int omnia_mcu_read(u8 cmd, void *buf, int len)
return dm_i2c_read(chip, cmd, buf, len); return dm_i2c_read(chip, cmd, buf, len);
} }
#ifndef CONFIG_SPL_BUILD
static int omnia_mcu_write(u8 cmd, const void *buf, int len) static int omnia_mcu_write(u8 cmd, const void *buf, int len)
{ {
struct udevice *chip; struct udevice *chip;
@ -158,7 +157,6 @@ static bool disable_mcu_watchdog(void)
return true; return true;
} }
#endif
static bool omnia_detect_sata(void) static bool omnia_detect_sata(void)
{ {
@ -325,7 +323,6 @@ struct mv_ddr_topology_map *mv_ddr_topology_map_get(void)
return &board_topology_map_1g; return &board_topology_map_1g;
} }
#ifndef CONFIG_SPL_BUILD
static int set_regdomain(void) static int set_regdomain(void)
{ {
struct omnia_eeprom oep; struct omnia_eeprom oep;
@ -394,7 +391,6 @@ static void handle_reset_button(void)
} }
} }
} }
#endif
int board_early_init_f(void) int board_early_init_f(void)
{ {
@ -428,19 +424,15 @@ int board_init(void)
/* address of boot parameters */ /* address of boot parameters */
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
#ifndef CONFIG_SPL_BUILD
disable_mcu_watchdog(); disable_mcu_watchdog();
#endif
return 0; return 0;
} }
int board_late_init(void) int board_late_init(void)
{ {
#ifndef CONFIG_SPL_BUILD
set_regdomain(); set_regdomain();
handle_reset_button(); handle_reset_button();
#endif
pci_init(); pci_init();
return 0; return 0;