bloblist: adjust default bloblist size after reloc
If neither CONFIG_BLOBLIST_FIXED NOR CONFIG_BLOBLIST_ALLOC is set, currently CONFIG_BLOBLIST_SIZE_RELOC defaults to 0 except if * CONFIG_ARM=y && CONFIG_EFI_LOADER=y && GENERATE_ACPI_TABLE=y. A size of zero never makes sense for a bloblist. When using QFW we need more than 64 KiB to host the ACPI table. In this case CONFIG_BLOBLIST_ALLOC is used. Set a reasonable default. Remove the CONFIG_BLOBLIST_SIZE_RELOC in ARM QEMU defconfigs which are not compatible with ACPI tables passed from QEMU. Reported-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> Fixes:6f9b015c13("common: Enable BLOBLIST_TABLES on arm") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> (cherry picked from commit559f11e66c)
This commit is contained in:
committed by
Simon Glass
parent
075a61cda9
commit
e1a1046c61
@@ -1130,8 +1130,8 @@ config BLOBLIST_SIZE
|
||||
|
||||
config BLOBLIST_SIZE_RELOC
|
||||
hex "Size of bloblist after relocation"
|
||||
default BLOBLIST_SIZE if BLOBLIST_FIXED || BLOBLIST_ALLOC
|
||||
default 0x20000 if (ARM && EFI_LOADER && GENERATE_ACPI_TABLE)
|
||||
default BLOBLIST_SIZE if BLOBLIST_FIXED
|
||||
default 0x20000
|
||||
help
|
||||
Sets the size of the bloblist in bytes after relocation. Since U-Boot
|
||||
has a lot more memory available then, it is possible to use a larger
|
||||
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_POSITION_INDEPENDENT=y
|
||||
CONFIG_ARCH_QEMU_ARM=y
|
||||
CONFIG_SYS_MALLOC_LEN=0x1000000
|
||||
CONFIG_BLOBLIST_SIZE_RELOC=0x2000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
|
||||
CONFIG_ENV_SIZE=0x40000
|
||||
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARM_SMCCC=y
|
||||
CONFIG_ARCH_QEMU_ARM=y
|
||||
CONFIG_SYS_MALLOC_LEN=0x1000000
|
||||
CONFIG_BLOBLIST_SIZE_RELOC=0x2000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
|
||||
CONFIG_ENV_SIZE=0x40000
|
||||
|
||||
Reference in New Issue
Block a user