diff options
| author | Andreas Schwab <schwab@suse.de> | 2019-02-04 15:05:36 +0100 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2019-02-06 10:39:17 +0530 |
| commit | 93f806af32cc75138cc9afd12ad9931a2954fc8f (patch) | |
| tree | 2b79e8bc10577a5a2d77d0943eaf514cf80f72bd /firmware | |
| parent | 190a80dc4014a1113ea317769b4875893f8e9890 (diff) | |
firwmare: don't expand macros in FW_PAYLOAD_PATH
Signed-off-by: Andreas Schwab <schwab@suse.de>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/fw_payload.S | 7 | ||||
| -rw-r--r-- | firmware/objects.mk | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/firmware/fw_payload.S b/firmware/fw_payload.S index 4d4db45..51381c1 100644 --- a/firmware/fw_payload.S +++ b/firmware/fw_payload.S @@ -41,15 +41,12 @@ fw_next_addr: la a0, payload_bin ret -#define str(s) #s -#define stringify(s) str(s) - #ifdef FW_PAYLOAD_FDT_PATH .align 3 .section .text, "ax", %progbits .globl fdt_bin fdt_bin: - .incbin stringify(FW_PAYLOAD_FDT_PATH) + .incbin FW_PAYLOAD_FDT_PATH #endif .section .payload, "ax", %progbits @@ -59,5 +56,5 @@ payload_bin: wfi j payload_bin #else - .incbin stringify(FW_PAYLOAD_PATH) + .incbin FW_PAYLOAD_PATH #endif diff --git a/firmware/objects.mk b/firmware/objects.mk index 89410f7..b8f6e88 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -31,7 +31,7 @@ FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH) else FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/test.bin 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 firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET) endif @@ -45,7 +45,7 @@ FW_PAYLOAD_FDT_PATH=$(build_dir)/$(platform_subdir)/$(FW_PAYLOAD_FDT) endif endif 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 ifdef FW_PAYLOAD_FDT_ADDR firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR) |