diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-10-14 16:43:34 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-10-18 10:29:59 +0530 |
| commit | 9c07c513aa9b2df64a971432e8dae3338a8e22ab (patch) | |
| tree | 1b3aedf8cfd58fc6cd5f9f41ea2530b4fdee76b0 /firmware | |
| parent | 6ca096977d723f3ac50291d668719bd938a85544 (diff) | |
firmware: Remove FW_PAYLOAD_FDT_PATH compile-time option
The FW_PAYLOAD_FDT_PATH compile-time option is replaced by
FW_FDT_PATH compile-time option which is more flexible and
common across all OpenSBI firmwares.
This patch removes FW_PAYLOAD_FDT_PATH and updates related
documentation to use FW_FDT_PATH.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/external_deps.mk | 1 | ||||
| -rw-r--r-- | firmware/fw_base.S | 9 | ||||
| -rw-r--r-- | firmware/fw_dynamic.S | 13 | ||||
| -rw-r--r-- | firmware/fw_jump.S | 13 | ||||
| -rw-r--r-- | firmware/fw_payload.S | 25 | ||||
| -rw-r--r-- | firmware/objects.mk | 3 |
6 files changed, 0 insertions, 64 deletions
diff --git a/firmware/external_deps.mk b/firmware/external_deps.mk index f43ac06..6264005 100644 --- a/firmware/external_deps.mk +++ b/firmware/external_deps.mk @@ -12,4 +12,3 @@ $(platform_build_dir)/firmware/fw_jump.o: $(FW_FDT_PATH) $(platform_build_dir)/firmware/fw_payload.o: $(FW_FDT_PATH) $(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_PATH_FINAL) -$(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_FDT_PATH) diff --git a/firmware/fw_base.S b/firmware/fw_base.S index 95197da..1d9b375 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -187,15 +187,6 @@ _bss_zero: la a1, fw_fdt_bin #endif - /* Override previous arg1 */ - MOV_3R s0, a0, s1, a1, s2, a2 - call fw_prev_arg1 - add t1, a0, zero - MOV_3R a0, s0, a1, s1, a2, s2 - beqz t1, _prev_arg1_override_done - add a1, t1, zero -_prev_arg1_override_done: - /* * Initialize platform * Note: The a0 to a4 registers passed to the diff --git a/firmware/fw_dynamic.S b/firmware/fw_dynamic.S index d658011..8b56947 100644 --- a/firmware/fw_dynamic.S +++ b/firmware/fw_dynamic.S @@ -88,19 +88,6 @@ fw_save_info: .section .entry, "ax", %progbits .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: - add a0, zero, zero - ret - - .section .entry, "ax", %progbits - .align 3 .global fw_next_arg1 /* * We can only use a0, a1, and a2 registers here. diff --git a/firmware/fw_jump.S b/firmware/fw_jump.S index afbcec0..8553f8c 100644 --- a/firmware/fw_jump.S +++ b/firmware/fw_jump.S @@ -36,19 +36,6 @@ fw_save_info: .section .entry, "ax", %progbits .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: - add a0, zero, zero - ret - - .section .entry, "ax", %progbits - .align 3 .global fw_next_arg1 /* * We can only use a0, a1, and a2 registers here. diff --git a/firmware/fw_payload.S b/firmware/fw_payload.S index 9805d8c..1ef121e 100644 --- a/firmware/fw_payload.S +++ b/firmware/fw_payload.S @@ -36,23 +36,6 @@ fw_save_info: .section .entry, "ax", %progbits .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: -#ifdef FW_PAYLOAD_FDT_PATH - la a0, fdt_bin -#else - add a0, zero, zero -#endif - ret - - .section .entry, "ax", %progbits - .align 3 .global fw_next_arg1 /* * We can only use a0, a1, and a2 registers here. @@ -102,14 +85,6 @@ fw_options: add a0, zero, zero ret -#ifdef FW_PAYLOAD_FDT_PATH - .section .text, "ax", %progbits - .align 4 - .globl fdt_bin -fdt_bin: - .incbin FW_PAYLOAD_FDT_PATH -#endif - .section .payload, "ax", %progbits .align 4 .globl payload_bin diff --git a/firmware/objects.mk b/firmware/objects.mk index 2eea54c..b2ace75 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -48,9 +48,6 @@ ifdef FW_PAYLOAD_ALIGN firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_ALIGN=$(FW_PAYLOAD_ALIGN) endif -ifdef 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) endif |