leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstage: Eliminate when not enabled

Browse Source 
When we do not have bootstage enabled, rather than include an empty
dummy function, we just don't reference it.  This saves us space in some
tight builds.  This also shows a few cases where show_boot_progress was
incorrectly guarded before.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-05-03 16:48:58 -04:00
parent c48b781581
commit cb80ff20f2
10 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/cpu.c
View File

@ -178,10 +178,12 @@ int default_print_cpuinfo(void)
return 0;
}
#if CONFIG_IS_ENABLED(BOOTSTAGE)
void show_boot_progress(int val)
{
outb(val, POST_PORT);
}
#endif
#if !defined(CONFIG_SYS_COREBOOT) && !defined(CONFIG_EFI_STUB)
/*

2
board/Seagate/dockstar/dockstar.c
View File

@ -140,6 +140,7 @@ void reset_phy(void)
}
#endif /* CONFIG_RESET_PHY_R */
#if CONFIG_IS_ENABLED(BOOTSTAGE)
#define GREEN_LED (1 << 14)
#define ORANGE_LED (1 << 15)
#define BOTH_LEDS (GREEN_LED | ORANGE_LED)
@ -169,3 +170,4 @@ void show_boot_progress(int val)
break;
}
}
#endif

2
board/Seagate/goflexhome/goflexhome.c
View File

@ -142,6 +142,7 @@ void reset_phy(void)
}
#endif /* CONFIG_RESET_PHY_R */
#if CONFIG_IS_ENABLED(BOOTSTAGE)
#define GREEN_LED (1 << 14)
#define ORANGE_LED (1 << 15)
#define BOTH_LEDS (GREEN_LED | ORANGE_LED)
@ -175,3 +176,4 @@ void show_boot_progress(int val)
break;
}
}
#endif

6
board/bosch/shc/board.c
View File

@ -188,7 +188,7 @@ static void __maybe_unused leds_set_booting(void)
/*
* Function to set the LEDs in the state "Bootloader error"
*/
static void leds_set_failure(int state)
static void __maybe_unused leds_set_failure(int state)
{
#if defined(CONFIG_B_SAMPLE)
/* Turn all blue and green LEDs off */
@ -479,7 +479,7 @@ int board_eth_init(struct bd_info *bis)
}
#endif
#ifdef CONFIG_SHOW_BOOT_PROGRESS
#if CONFIG_IS_ENABLED(BOOTSTAGE)
static void bosch_check_reset_pin(void)
{
if (readl(GPIO1_BASE + OMAP_GPIO_IRQSTATUS_SET_0) & RESET_MASK) {
@ -525,9 +525,9 @@ void show_boot_progress(int val)
break;
}
}
#endif
void arch_preboot_os(void)
{
leds_set_finish();
}
#endif

2
board/buffalo/lsxl/lsxl.c
View File

@ -271,7 +271,7 @@ int misc_init_r(void)
}
#endif
#ifdef CONFIG_SHOW_BOOT_PROGRESS
#if CONFIG_IS_ENABLED(BOOTSTAGE)
void show_boot_progress(int progress)
{
if (progress > 0)

2
board/k+p/kp_imx53/kp_imx53.c
View File

@ -155,6 +155,7 @@ int board_late_init(void)
return ret;
}
#if CONFIG_IS_ENABLED(BOOTSTAGE)
#define GPIO_DR 0x0
#define GPIO_GDIR 0x4
#define GPIO_ALT1 0x1
@ -203,3 +204,4 @@ void show_boot_progress(int status)
gpio_direction_output(LED_RED, 1);
}
}
#endif

2
board/st/stv0991/stv0991.c
View File

@ -37,7 +37,7 @@ U_BOOT_DRVINFO(stv09911_serials) = {
};
#endif
#ifdef CONFIG_SHOW_BOOT_PROGRESS
#if CONFIG_IS_ENABLED(BOOTSTAGE)
void show_boot_progress(int progress)
{
printf("%i\n", progress);

2
common/init/board_init.c
View File

@ -166,7 +166,9 @@ void board_init_f_init_reserve(ulong base)
board_init_f_init_stack_protection();
}
#if CONFIG_IS_ENABLED(BOOTSTAGE)
/*
* Board-specific Platform code can reimplement show_boot_progress () if needed
*/
__weak void show_boot_progress(int val) {}
#endif

2
common/spl/spl.c
View File

@ -58,10 +58,12 @@ binman_sym_declare(ulong, spl, size);
/* Define board data structure */
static struct bd_info bdata __attribute__ ((section(".data")));
#if CONFIG_IS_ENABLED(BOOTSTAGE)
/*
* Board-specific Platform code can reimplement show_boot_progress () if needed
*/
__weak void show_boot_progress(int val) {}
#endif
#if defined(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF) || \
defined(CONFIG_SPL_ATF)

4
include/bootstage.h
View File

@ -11,6 +11,8 @@
#ifndef _BOOTSTAGE_H
#define _BOOTSTAGE_H
#include <linux/kconfig.h>
/* Flags for each bootstage record */
enum bootstage_flags {
BOOTSTAGEF_ERROR = 1 << 0, /* Error record */
@ -218,7 +220,7 @@ enum bootstage_id {
*/
ulong timer_get_boot_us(void);
#if defined(USE_HOSTCC)
#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(BOOTSTAGE)
#define show_boot_progress(val) do {} while (0)
#else
/**