Maximilian Brune has uploaded this change for review.
arch/riscv/Makefile.inc: 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 <maximilian.brune@9elements.com>
Change-Id: Ic14fa77d2f223664b9faba048b759e03efffcde8
---
M src/arch/riscv/Makefile.inc
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/79952/1
diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc
index bbd3959..4438d49 100644
--- a/src/arch/riscv/Makefile.inc
+++ b/src/arch/riscv/Makefile.inc
@@ -96,7 +96,9 @@
################################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_RISCV),y)
+ifeq ($(CONFIG_SEPARATE_ROMSTAGE),y)
romstage-y += romstage.S
+endif
# Build the romstage
@@ -157,16 +159,15 @@
mkdir -p $(OPENSBI_BUILD)
$(MAKE) \
-C "$(OPENSBI_SOURCE)" \
- CC="$(GCC_ramstage) -fno-builtin" \
+ CC="$(CC_ramstage) -fno-builtin" \
LD="$(LD_ramstage)" \
OBJCOPY="$(OBJCOPY_ramstage)" \
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)
To view, visit change 79952. To unsubscribe, or for help writing mail filters, visit settings.