Mirrors/opensbi
7
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-25 15:51:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

firwmare: don't expand macros in FW_PAYLOAD_PATH

Browse Source 
Signed-off-by: Andreas Schwab <schwab@suse.de>
This commit is contained in:
Andreas Schwab
2019-02-04 15:05:36 +01:00
committed by Anup Patel
parent 190a80dc40
commit 93f806af32
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/fw_payload.S
View File

@@ -41,15 +41,12 @@ fw_next_addr:
la a0, payload_bin la a0, payload_bin
ret ret
#define str(s) #s
#define stringify(s) str(s)
#ifdef FW_PAYLOAD_FDT_PATH #ifdef FW_PAYLOAD_FDT_PATH
.align 3 .align 3
.section .text, "ax", %progbits .section .text, "ax", %progbits
.globl fdt_bin .globl fdt_bin
fdt_bin: fdt_bin:
.incbin stringify(FW_PAYLOAD_FDT_PATH) .incbin FW_PAYLOAD_FDT_PATH
#endif #endif
.section .payload, "ax", %progbits .section .payload, "ax", %progbits
@@ -59,5 +56,5 @@ payload_bin:
wfi wfi
j payload_bin j payload_bin
#else #else
.incbin stringify(FW_PAYLOAD_PATH) .incbin FW_PAYLOAD_PATH
#endif #endif

4
firmware/objects.mk
View File

@@ -31,7 +31,7 @@ FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH)
else else
FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/test.bin FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/test.bin
endif endif
firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL) firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=\"$(FW_PAYLOAD_PATH_FINAL)\"
ifdef FW_PAYLOAD_OFFSET ifdef FW_PAYLOAD_OFFSET
firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET) firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET)
endif endif
@@ -45,7 +45,7 @@ FW_PAYLOAD_FDT_PATH=$(build_dir)/$(platform_subdir)/$(FW_PAYLOAD_FDT)
endif endif
endif endif
ifdef FW_PAYLOAD_FDT_PATH ifdef FW_PAYLOAD_FDT_PATH
firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_PATH=$(FW_PAYLOAD_FDT_PATH) firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_PATH=\"$(FW_PAYLOAD_FDT_PATH)\"
endif endif
ifdef FW_PAYLOAD_FDT_ADDR ifdef FW_PAYLOAD_FDT_ADDR
firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR) firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR)