Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4a59ada5e60d25ea43d3c5f2baf1860ed3c32770

Authored by Heinrich Schuchardt
Committed by Alexander Graf
1 parent 3cc6e3fe95
Exists in smarc_8mq_lf_v2020.04 and in 17 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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, 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_selftest: enable CONFIG_CMD_BOOTEFI_SELFTEST 

The EFI selftest has been broken by a patch on efi-next.
We should enable CONFIG_CMD_BOOTEFI_SELFTEST on
qemu-x86_defconfig and qemu-x86_64_defconfig by default
to catch this type of problem in the Travis CI tests.

These systems typically have abundant memory so that
enabling this option should not pose a problem.

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

Showing 2 changed files with 2 additions and 0 deletions Inline Diff

configs/qemu-x86_64_defconfig
Diff comments   View file @ 4a59ada
1 CONFIG_X86=y 1 CONFIG_X86=y
2 CONFIG_SPL_LIBCOMMON_SUPPORT=y 2 CONFIG_SPL_LIBCOMMON_SUPPORT=y
3 CONFIG_SPL_LIBGENERIC_SUPPORT=y 3 CONFIG_SPL_LIBGENERIC_SUPPORT=y
4 CONFIG_SYS_MALLOC_F_LEN=0x1000 4 CONFIG_SYS_MALLOC_F_LEN=0x1000
5 CONFIG_MAX_CPUS=2 5 CONFIG_MAX_CPUS=2
6 CONFIG_SPL_SERIAL_SUPPORT=y 6 CONFIG_SPL_SERIAL_SUPPORT=y
7 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y 7 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
8 CONFIG_SPL_SPI_SUPPORT=y 8 CONFIG_SPL_SPI_SUPPORT=y
9 CONFIG_X86_RUN_64BIT=y 9 CONFIG_X86_RUN_64BIT=y
10 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" 10 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
11 CONFIG_TARGET_QEMU_X86_64=y 11 CONFIG_TARGET_QEMU_X86_64=y
12 CONFIG_DEBUG_UART=y 12 CONFIG_DEBUG_UART=y
13 CONFIG_SMP=y 13 CONFIG_SMP=y
14 CONFIG_GENERATE_PIRQ_TABLE=y 14 CONFIG_GENERATE_PIRQ_TABLE=y
15 CONFIG_GENERATE_MP_TABLE=y 15 CONFIG_GENERATE_MP_TABLE=y
16 CONFIG_GENERATE_ACPI_TABLE=y 16 CONFIG_GENERATE_ACPI_TABLE=y
17 CONFIG_FIT=y 17 CONFIG_FIT=y
18 CONFIG_SPL_LOAD_FIT=y 18 CONFIG_SPL_LOAD_FIT=y
19 CONFIG_BOOTSTAGE=y 19 CONFIG_BOOTSTAGE=y
20 CONFIG_BOOTSTAGE_REPORT=y 20 CONFIG_BOOTSTAGE_REPORT=y
21 CONFIG_USE_BOOTARGS=y 21 CONFIG_USE_BOOTARGS=y
22 CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" 22 CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
23 CONFIG_SYS_CONSOLE_INFO_QUIET=y 23 CONFIG_SYS_CONSOLE_INFO_QUIET=y
24 CONFIG_SPL_SYS_MALLOC_SIMPLE=y 24 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
25 CONFIG_SPL_CPU_SUPPORT=y 25 CONFIG_SPL_CPU_SUPPORT=y
26 CONFIG_SPL_ENV_SUPPORT=y 26 CONFIG_SPL_ENV_SUPPORT=y
27 CONFIG_SPL_NET_SUPPORT=y 27 CONFIG_SPL_NET_SUPPORT=y
28 CONFIG_SPL_PCI_SUPPORT=y 28 CONFIG_SPL_PCI_SUPPORT=y
29 CONFIG_SPL_PCH_SUPPORT=y 29 CONFIG_SPL_PCH_SUPPORT=y
30 CONFIG_SPL_RTC_SUPPORT=y 30 CONFIG_SPL_RTC_SUPPORT=y
31 CONFIG_HUSH_PARSER=y 31 CONFIG_HUSH_PARSER=y
32 CONFIG_CMD_CPU=y 32 CONFIG_CMD_CPU=y
33 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set 33 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
34 # CONFIG_CMD_IMLS is not set 34 # CONFIG_CMD_IMLS is not set
35 # CONFIG_CMD_FLASH is not set 35 # CONFIG_CMD_FLASH is not set
36 CONFIG_CMD_IDE=y 36 CONFIG_CMD_IDE=y
37 CONFIG_CMD_SF=y 37 CONFIG_CMD_SF=y
38 CONFIG_CMD_SPI=y 38 CONFIG_CMD_SPI=y
39 CONFIG_CMD_USB=y 39 CONFIG_CMD_USB=y
40 # CONFIG_CMD_SETEXPR is not set 40 # CONFIG_CMD_SETEXPR is not set
41 CONFIG_CMD_DHCP=y 41 CONFIG_CMD_DHCP=y
42 # CONFIG_CMD_NFS is not set 42 # CONFIG_CMD_NFS is not set
43 CONFIG_CMD_PING=y 43 CONFIG_CMD_PING=y
44 CONFIG_CMD_TIME=y 44 CONFIG_CMD_TIME=y
45 CONFIG_CMD_QFW=y 45 CONFIG_CMD_QFW=y
46 CONFIG_CMD_BOOTSTAGE=y 46 CONFIG_CMD_BOOTSTAGE=y
47 CONFIG_CMD_EXT2=y 47 CONFIG_CMD_EXT2=y
48 CONFIG_CMD_EXT4=y 48 CONFIG_CMD_EXT4=y
49 CONFIG_CMD_EXT4_WRITE=y 49 CONFIG_CMD_EXT4_WRITE=y
50 CONFIG_CMD_FAT=y 50 CONFIG_CMD_FAT=y
51 CONFIG_CMD_FS_GENERIC=y 51 CONFIG_CMD_FS_GENERIC=y
52 CONFIG_SPL_OF_CONTROL=y 52 CONFIG_SPL_OF_CONTROL=y
53 CONFIG_SPL_DM=y 53 CONFIG_SPL_DM=y
54 CONFIG_REGMAP=y 54 CONFIG_REGMAP=y
55 CONFIG_SPL_REGMAP=y 55 CONFIG_SPL_REGMAP=y
56 CONFIG_SYSCON=y 56 CONFIG_SYSCON=y
57 CONFIG_SPL_SYSCON=y 57 CONFIG_SPL_SYSCON=y
58 CONFIG_CPU=y 58 CONFIG_CPU=y
59 CONFIG_DEBUG_UART_BASE=0x3f8 59 CONFIG_DEBUG_UART_BASE=0x3f8
60 CONFIG_DEBUG_UART_CLOCK=1843200 60 CONFIG_DEBUG_UART_CLOCK=1843200
61 CONFIG_SPL_TIMER=y 61 CONFIG_SPL_TIMER=y
62 CONFIG_USB_STORAGE=y 62 CONFIG_USB_STORAGE=y
63 CONFIG_USB_KEYBOARD=y 63 CONFIG_USB_KEYBOARD=y
64 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y 64 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
65 CONFIG_FRAMEBUFFER_VESA_MODE_111=y 65 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
66 CONFIG_CONSOLE_SCROLL_LINES=5 66 CONFIG_CONSOLE_SCROLL_LINES=5
67 CONFIG_CMD_BOOTEFI_SELFTEST=y
67 68
configs/qemu-x86_defconfig
Diff comments   View file @ 4a59ada
1 CONFIG_X86=y 1 CONFIG_X86=y
2 CONFIG_MAX_CPUS=2 2 CONFIG_MAX_CPUS=2
3 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" 3 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
4 CONFIG_SMP=y 4 CONFIG_SMP=y
5 CONFIG_GENERATE_PIRQ_TABLE=y 5 CONFIG_GENERATE_PIRQ_TABLE=y
6 CONFIG_GENERATE_MP_TABLE=y 6 CONFIG_GENERATE_MP_TABLE=y
7 CONFIG_GENERATE_ACPI_TABLE=y 7 CONFIG_GENERATE_ACPI_TABLE=y
8 CONFIG_FIT=y 8 CONFIG_FIT=y
9 CONFIG_BOOTSTAGE=y 9 CONFIG_BOOTSTAGE=y
10 CONFIG_BOOTSTAGE_REPORT=y 10 CONFIG_BOOTSTAGE_REPORT=y
11 CONFIG_USE_BOOTARGS=y 11 CONFIG_USE_BOOTARGS=y
12 CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" 12 CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
13 CONFIG_SYS_CONSOLE_INFO_QUIET=y 13 CONFIG_SYS_CONSOLE_INFO_QUIET=y
14 CONFIG_HUSH_PARSER=y 14 CONFIG_HUSH_PARSER=y
15 CONFIG_CMD_CPU=y 15 CONFIG_CMD_CPU=y
16 # CONFIG_CMD_IMLS is not set 16 # CONFIG_CMD_IMLS is not set
17 # CONFIG_CMD_FLASH is not set 17 # CONFIG_CMD_FLASH is not set
18 CONFIG_CMD_IDE=y 18 CONFIG_CMD_IDE=y
19 CONFIG_CMD_PART=y 19 CONFIG_CMD_PART=y
20 CONFIG_CMD_SF=y 20 CONFIG_CMD_SF=y
21 CONFIG_CMD_SPI=y 21 CONFIG_CMD_SPI=y
22 CONFIG_CMD_USB=y 22 CONFIG_CMD_USB=y
23 # CONFIG_CMD_SETEXPR is not set 23 # CONFIG_CMD_SETEXPR is not set
24 CONFIG_CMD_DHCP=y 24 CONFIG_CMD_DHCP=y
25 # CONFIG_CMD_NFS is not set 25 # CONFIG_CMD_NFS is not set
26 CONFIG_CMD_PING=y 26 CONFIG_CMD_PING=y
27 CONFIG_CMD_TIME=y 27 CONFIG_CMD_TIME=y
28 CONFIG_CMD_QFW=y 28 CONFIG_CMD_QFW=y
29 CONFIG_CMD_BOOTSTAGE=y 29 CONFIG_CMD_BOOTSTAGE=y
30 CONFIG_CMD_EXT2=y 30 CONFIG_CMD_EXT2=y
31 CONFIG_CMD_EXT4=y 31 CONFIG_CMD_EXT4=y
32 CONFIG_CMD_EXT4_WRITE=y 32 CONFIG_CMD_EXT4_WRITE=y
33 CONFIG_CMD_FAT=y 33 CONFIG_CMD_FAT=y
34 CONFIG_CMD_FS_GENERIC=y 34 CONFIG_CMD_FS_GENERIC=y
35 CONFIG_MAC_PARTITION=y 35 CONFIG_MAC_PARTITION=y
36 CONFIG_ISO_PARTITION=y 36 CONFIG_ISO_PARTITION=y
37 CONFIG_EFI_PARTITION=y 37 CONFIG_EFI_PARTITION=y
38 CONFIG_REGMAP=y 38 CONFIG_REGMAP=y
39 CONFIG_SYSCON=y 39 CONFIG_SYSCON=y
40 CONFIG_CPU=y 40 CONFIG_CPU=y
41 CONFIG_NVME=y 41 CONFIG_NVME=y
42 CONFIG_USB_STORAGE=y 42 CONFIG_USB_STORAGE=y
43 CONFIG_USB_KEYBOARD=y 43 CONFIG_USB_KEYBOARD=y
44 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y 44 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
45 CONFIG_FRAMEBUFFER_VESA_MODE_111=y 45 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
46 CONFIG_CONSOLE_SCROLL_LINES=5 46 CONFIG_CONSOLE_SCROLL_LINES=5
47 CONFIG_CMD_BOOTEFI_SELFTEST=y
47 48