Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0ea8741ff65e2b1cf86763b1f6392499df286ce1

Authored by Heinrich Schuchardt
Committed by Alexander Graf
1 parent 0a76ba6556
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

efi_loader: CMD_BOOTEFI_HELLO_COMPILE in configs 

It should not be necessary to adjust CMD_BOOTEFI_HELLO_COMPILE in config
files.

arch/arm/lib/crt0_arm_efi.S cannot be compiled in thumbs mode. We can
disable CMD_BOOTEFI_HELLO_COMPILE for CONFIG_CPU_V7M. So there is no longer
a need to disable it in stm32 configs.

helloworld.efi can be built without problems on x86_64. So there is no need
to disable it in chromebook_link64_defconfig and qemu-x86_64_defconfig.

Same is true for ARM V7A. So do not disable CMD_BOOTEFI_HELLO_COMPILE in
kp_imx6q_tpc_defconfig.

Some architecture checks are already make for EFI_LOADER. There is no need
to repeat them for CMD_BOOTEFI_HELLO_COMPILE

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrice.Chotard@st.com
Signed-off-by: Alexander Graf <agraf@suse.de>

Showing 7 changed files with 1 additions and 7 deletions Side-by-side Diff

... ... @@ -226,7 +226,7 @@
226 226  
227 227 config CMD_BOOTEFI_HELLO_COMPILE
228 228 bool "Compile a standard EFI hello world binary for testing"
229   - depends on CMD_BOOTEFI && (ARM || X86 || RISCV)
  229 + depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX
230 230 default y
231 231 help
232 232 This compiles a standard EFI hello world application with U-Boot so
configs/chromebook_link64_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -38,7 +38,6 @@
38 38 CONFIG_SPL_RTC_SUPPORT=y
39 39 CONFIG_HUSH_PARSER=y
40 40 CONFIG_CMD_CPU=y
41   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
42 41 # CONFIG_CMD_FLASH is not set
43 42 CONFIG_CMD_GPIO=y
44 43 CONFIG_CMD_SF=y
configs/kp_imx6q_tpc_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -21,7 +21,6 @@
21 21 CONFIG_SPL_WATCHDOG_SUPPORT=y
22 22 CONFIG_AUTOBOOT_KEYED=y
23 23 CONFIG_AUTOBOOT_STOP_STR="."
24   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
25 24 # CONFIG_CMD_ELF is not set
26 25 # CONFIG_CMD_FLASH is not set
27 26 CONFIG_CMD_GPIO=y
configs/qemu-x86_64_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -36,7 +36,6 @@
36 36 CONFIG_SPL_RTC_SUPPORT=y
37 37 CONFIG_HUSH_PARSER=y
38 38 CONFIG_CMD_CPU=y
39   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
40 39 CONFIG_CMD_BOOTEFI_SELFTEST=y
41 40 # CONFIG_CMD_FLASH is not set
42 41 CONFIG_CMD_IDE=y
configs/stm32f429-discovery_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -15,7 +15,6 @@
15 15 CONFIG_BOARD_EARLY_INIT_F=y
16 16 CONFIG_HUSH_PARSER=y
17 17 CONFIG_SYS_PROMPT="U-Boot > "
18   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
19 18 CONFIG_CMD_IMLS=y
20 19 # CONFIG_CMD_SETEXPR is not set
21 20 CONFIG_CMD_TIMER=y
configs/stm32f429-evaluation_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -12,7 +12,6 @@
12 12 # CONFIG_DISPLAY_CPUINFO is not set
13 13 CONFIG_BOARD_EARLY_INIT_F=y
14 14 CONFIG_SYS_PROMPT="U-Boot > "
15   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
16 15 CONFIG_CMD_IMLS=y
17 16 CONFIG_CMD_GPT=y
18 17 # CONFIG_RANDOM_UUID is not set
configs/stm32f469-discovery_defconfig
Diff comments   View file @ 0ea8741
... ... @@ -12,7 +12,6 @@
12 12 # CONFIG_DISPLAY_CPUINFO is not set
13 13 CONFIG_BOARD_EARLY_INIT_F=y
14 14 CONFIG_SYS_PROMPT="U-Boot > "
15   -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
16 15 CONFIG_CMD_IMLS=y
17 16 CONFIG_CMD_GPT=y
18 17 # CONFIG_RANDOM_UUID is not set