From 6270e74025fd2f28ecc4976ad7f0f828b2eb8ab7 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Sun, 14 Jan 2024 20:45:00 +0600 Subject: arch/riscv/Makefile.mk: Fix OpenSBI compilation 1. romstage.S should only be included if we have a separate romstage 2. FW_JUMP and FW_DYNAMIC are opposing options and we only support FW_DYNAMIC Signed-off-by: Maximilian Brune Change-Id: Ic14fa77d2f223664b9faba048b759e03efffcde8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/79952 Reviewed-by: Philipp Hug Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/arch/riscv/Makefile.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/arch') diff --git a/src/arch/riscv/Makefile.mk b/src/arch/riscv/Makefile.mk index bbd39590d2..1267195b21 100644 --- a/src/arch/riscv/Makefile.mk +++ b/src/arch/riscv/Makefile.mk @@ -96,7 +96,7 @@ endif #CONFIG_ARCH_BOOTBLOCK_RISCV ################################################################################ ifeq ($(CONFIG_ARCH_ROMSTAGE_RISCV),y) -romstage-y += romstage.S +romstage-$(CONFIG_SEPARATE_ROMSTAGE) += romstage.S # Build the romstage @@ -163,10 +163,9 @@ $(OPENSBI_TARGET): $(obj)/config.h | $(OPENSBI_SOURCE) AR="$(AR_ramstage)" \ PLATFORM=$(CONFIG_OPENSBI_PLATFORM) \ O="$(OPENSBI_BUILD)" \ - FW_JUMP=y \ + FW_JUMP=n \ FW_DYNAMIC=y \ FW_PAYLOAD=n \ - FW_PAYLOAD_OFFSET=0 \ FW_TEXT_START=$(CONFIG_OPENSBI_TEXT_START) $(OPENSBI): $(OPENSBI_TARGET) -- cgit v1.2.3