diff options
| author | Maximilian Brune <maximilian.brune@9elements.com> | 2024-01-14 20:45:00 +0600 |
|---|---|---|
| committer | Lean Sheng Tan <sheng.tan@9elements.com> | 2024-02-18 07:53:27 +0000 |
| commit | 6270e74025fd2f28ecc4976ad7f0f828b2eb8ab7 (patch) | |
| tree | 0d64c114ac86aa560bed1bdd7b476af9b9d46995 | |
| parent | 732134932b7b01262fbcb3e08328ec09af1f90e8 (diff) | |
| download | coreboot-6270e74025fd2f28ecc4976ad7f0f828b2eb8ab7.tar.gz coreboot-6270e74025fd2f28ecc4976ad7f0f828b2eb8ab7.tar.bz2 coreboot-6270e74025fd2f28ecc4976ad7f0f828b2eb8ab7.zip | |
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 <maximilian.brune@9elements.com>
Change-Id: Ic14fa77d2f223664b9faba048b759e03efffcde8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79952
Reviewed-by: Philipp Hug <philipp@hug.cx>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
| -rw-r--r-- | src/arch/riscv/Makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/riscv/Makefile.mk b/src/arch/riscv/Makefile.mk index bbd39590d25d..1267195b2118 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) |