When we don't have BLOBLIST_PASSAGE_MANDATORY enabled, then we're being passed the device tree in some other manner, via OF_HAS_PRIOR_STAGE. Correct our logic around which symbols are used to guard what is generated / used and when.
Signed-off-by: Tom Rini <[email protected]> --- Cc: David Feng <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Peter Hoyes <[email protected]> Cc: Raymond Mao <[email protected]> Cc: Ilias Apalodimas <[email protected]> --- board/armltd/vexpress64/Kconfig | 2 +- board/armltd/vexpress64/Makefile | 2 ++ board/armltd/vexpress64/vexpress64.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 49c7fda0b83a..a988c7198498 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -31,7 +31,7 @@ choice config TARGET_VEXPRESS64_BASE_FVP bool "Support Versatile Express ARMv8a FVP BASE model" select VEXPRESS64_BASE_MODEL - imply OF_HAS_PRIOR_STAGE if !BLOBLIST + imply OF_HAS_PRIOR_STAGE config TARGET_VEXPRESS64_BASER_FVP bool "Support Versatile Express ARMv8r64 FVP BASE model" diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile index b0dd1d0af879..5f9dc2af930a 100644 --- a/board/armltd/vexpress64/Makefile +++ b/board/armltd/vexpress64/Makefile @@ -5,6 +5,8 @@ obj-y := vexpress64.o +ifeq ($(CONFIG_BLOBLIST_PASSAGE_MANDATORY),) obj-$(CONFIG_OF_HAS_PRIOR_STAGE) += lowlevel_init.o +endif obj-$(CONFIG_TARGET_VEXPRESS64_JUNO) += pcie.o diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index d68da0e3d650..8b6b96d757d5 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -97,7 +97,7 @@ int dram_init_banksize(void) * Push the variable into the .data section so that it * does not get cleared later. */ -#ifdef CONFIG_OF_HAS_PRIOR_STAGE +#ifndef CONFIG_BLOBLIST_PASSAGE_MANDATORY unsigned long __section(".data") prior_stage_fdt_address[2]; #endif @@ -150,7 +150,7 @@ static phys_addr_t find_dtb_in_nor_flash(const char *partname) } #endif -#ifdef CONFIG_OF_HAS_PRIOR_STAGE +#ifndef CONFIG_BLOBLIST_PASSAGE_MANDATORY /* * Filter for a valid DTB, as TF-A happens to provide a pointer to some * data structure using the DTB format, which we cannot use. -- 2.43.0
