diff options
| author | Marek Vasut <[email protected]> | 2024-10-20 17:43:12 +0200 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-24 11:19:55 -0600 |
| commit | f692cfeeb3361ea25f1c06780e477238ef769c02 (patch) | |
| tree | 9e5e93ce21a572be4eebd3d7dc62e618cfc325a3 /test/boot | |
| parent | 3cf94b6f41dfb8e237d8b62cb90439cb7f5183c1 (diff) | |
boot: Introduce BOOTSTD_MENU to control bootflow menu build
The bootflow_menu.c code depends on e.g. scene_txt_set_font(),
which is only built when CONFIG_EXPO is enabled. Introduce new
Kconfig symbol BOOTSTD_MENU which depends on EXPO to prevent
triggering errors like these in case e.g. CONFIG_VIDEO=n :
"
boot/bootflow_menu.c:158:(.text+0x8851): undefined reference to `scene_txt_set_font'
"
Make the symbol depend on BOOTSTD_FULL as well to get rid of
the Makefile dependency workaround. Since BOOTSTD_FULL is not
available in SPL, do not define SPL variant of BOOTSTD_MENU.
Fix up bootflow test accordingly.
Signed-off-by: Marek Vasut <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'test/boot')
| -rw-r--r-- | test/boot/bootflow.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 154dea70a59..0d4e966892e 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -857,6 +857,9 @@ static int bootflow_menu_theme(struct unit_test_state *uts) ofnode node; int i; + if (!CONFIG_IS_ENABLED(BOOTSTD_MENU)) + return -EAGAIN; + ut_assertok(scan_mmc4_bootdev(uts)); ut_assertok(bootflow_menu_new(&exp)); |