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: 6f9b015c138b ("common: Enable BLOBLIST_TABLES on arm")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/common/Kconfig b/common/Kconfig
index cb17f0561537bb9b88a31c159dc9d64c5c0f4e45..66dcc8cde15f3f8eae66e56072605fd9c2e8df13 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1128,8 +1128,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

diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index 358bb1aeeb9656439a1fac4bef2605b28d89293a..12ed6b6123928791dff26ee2b8b2fd59a1c035c2 100644 (file)
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
 CONFIG_KVM_VIRT_INS=y
 CONFIG_ARCH_QEMU=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
-CONFIG_BLOBLIST_SIZE_RELOC=0x2000
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_SECT_SIZE=0x40000

diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
index d5890bf87fb3fcd6ce94246e388db0bca4b1c490..e6d4414cf0d50158d0952b4cc598666141361ca4 100644 (file)
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -3,7 +3,6 @@ CONFIG_KVM_VIRT_INS=y
 CONFIG_ARM_SMCCC=y
 CONFIG_ARCH_QEMU=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
-CONFIG_BLOBLIST_SIZE_RELOC=0x2000
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_SECT_SIZE=0x40000