firmware: Bring back FW_TEXT_START as an optional parameter
PATCH 1/1 firmware: Bring back FW_TEXT_START as an optional parameter
Bring back FW_TEXT_START as an optional parameter to allow users explicitly specify compile time address for loading debug symbols. When not specified, the FW_TEXT_START is assumed to be 0.
--- docs/firmware/fw.md | 3 +++ firmware/fw_base.S | 4 +++- firmware/fw_base.ldS | 3 ++- firmware/fw_payload.elf.ldS | 2 +- firmware/objects.mk | 6 ++++++ firmware/payloads/test.elf.ldS | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-)
docs/firmware/fw.md +3 -0
@@ -61,6 +61,9 @@ Firmware Configuration and Compilation All firmware types support the following common compile time configuration parameters: +* **FW_TEXT_START** - Defines the compile time address of the OpenSBI + firmware. This configuration parameter is optional and assumed to be + `0` if not specified. * **FW_FDT_PATH** - Path to an external flattened device tree binary file to be embedded in the *.rodata* section of the final firmware. If this option is not provided then the firmware will expect the FDT to be passed as an
firmware/fw_base.S +3 -1
@@ -53,7 +53,9 @@ _try_lottery: bnez a6, _wait_for_boot_hart /* relocate the global table content */ - lla t2, _fw_start + li t0, FW_TEXT_START /* link start */ + lla t1, _fw_start /* load start */ + sub t2, t1, t0 /* load offset */ lla t0, __rel_dyn_start lla t1, __rel_dyn_end beq t0, t1, _relocate_done
firmware/fw_base.ldS +2 -1
@@ -7,7 +7,8 @@ * Anup Patel <[email protected]> */ - /* Don't add any section before _fw_start */ + . = FW_TEXT_START; + /* Don't add any section between FW_TEXT_START and _fw_start */ PROVIDE(_fw_start = .); . = ALIGN(0x1000); /* Need this to create proper sections */
firmware/fw_payload.elf.ldS +1 -1
@@ -15,7 +15,7 @@ SECTIONS #include "fw_base.ldS" #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endif
firmware/objects.mk +6 -0
@@ -13,6 +13,12 @@ firmware-cflags-y += firmware-asflags-y += firmware-ldflags-y += +ifdef FW_TEXT_START +firmware-genflags-y += -DFW_TEXT_START=$(FW_TEXT_START) +else +firmware-genflags-y += -DFW_TEXT_START=0x0 +endif + ifdef FW_FDT_PATH firmware-genflags-y += -DFW_FDT_PATH=\"$(FW_FDT_PATH)\" ifdef FW_FDT_PADDING
firmware/payloads/test.elf.ldS +1 -1
@@ -13,7 +13,7 @@ ENTRY(_start) SECTIONS { #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endif
Signature · 1 line
2.34.1
PATCH 1/1 firmware: Bring back FW_TEXT_START as an optional parameter
Quoted 93 lines · Anup Patel
Bring back
FW_TEXT_STARTas an optional parameter to allow users explicitly specify compile time address for loading debug symbols. When not specified, theFW_TEXT_STARTis assumed to be 0.Fixes d4d2582eef7a ("firmware: remove FW_TEXT_START")Signed-off-by Anup Patel <[email protected]>--- docs/firmware/fw.md | 3 +++ firmware/fw_base.S | 4 +++- firmware/fw_base.ldS | 3 ++- firmware/fw_payload.elf.ldS | 2 +- firmware/objects.mk | 6 ++++++ firmware/payloads/test.elf.ldS | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-)docs/firmware/fw.md +3
-0@@ -61,6 +61,9 @@ Firmware Configuration and Compilation All firmware types support the following common compile time configuration parameters: +* **FW_TEXT_START** - Defines the compile time address of the OpenSBI + firmware. This configuration parameter is optional and assumed to be + `0` if not specified. * **FW_FDT_PATH** - Path to an external flattened device tree binary file to be embedded in the *.rodata* section of the final firmware. If this option is not provided then the firmware will expect the FDT to be passed as anfirmware/fw_base.S +3
-1@@ -53,7 +53,9 @@ _try_lottery: bnez a6, _wait_for_boot_hart /* relocate the global table content */ - lla t2, _fw_start + li t0, FW_TEXT_START /* link start */ + lla t1, _fw_start /* load start */ + sub t2, t1, t0 /* load offset */ lla t0, __rel_dyn_start lla t1, __rel_dyn_end beq t0, t1, _relocate_donefirmware/fw_base.ldS +2
-1@@ -7,7 +7,8 @@ * Anup Patel <[email protected]> */ - /* Don't add any section before _fw_start */ + . = FW_TEXT_START; + /* Don't add any section between FW_TEXT_START and _fw_start */ PROVIDE(_fw_start = .); . = ALIGN(0x1000); /* Need this to create proper sections */firmware/fw_payload.elf.ldS +1
-1@@ -15,7 +15,7 @@ SECTIONS #include "fw_base.ldS" #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endiffirmware/objects.mk +6
-0@@ -13,6 +13,12 @@ firmware-cflags-y += firmware-asflags-y += firmware-ldflags-y += +ifdef FW_TEXT_START +firmware-genflags-y += -DFW_TEXT_START=$(FW_TEXT_START) +else +firmware-genflags-y += -DFW_TEXT_START=0x0 +endif + ifdef FW_FDT_PATH firmware-genflags-y += -DFW_FDT_PATH=\"$(FW_FDT_PATH)\" ifdef FW_FDT_PADDINGfirmware/payloads/test.elf.ldS +0
-0
firmware/payloads/test.elf.ldS ENTRY(_start) · line 19
Quoted 8 lines
firmware/payloads/test.elf.ldS +1
-1@@ -13,7 +13,7 @@ ENTRY(_start) SECTIONS { #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endif
Hi Anup,
In the meantime, I added elf ET_DYN support to spike, I'll send the patches.
Thanks,
Cl?ment
Anup Patel
AppliedPATCH 1/1 firmware: Bring back FW_TEXT_START as an optional parameter
In reply to Anup PatelQuoted 7 lines · On Wed, May 15, 2024 at 11:57?AM Anup Patel <[email protected]> wrote:
Bring back
FW_TEXT_STARTas an optional parameter to allow users explicitly specify compile time address for loading debug symbols. When not specified, theFW_TEXT_STARTis assumed to be 0.Fixes d4d2582eef7a ("firmware: remove FW_TEXT_START")Signed-off-by Anup Patel <[email protected]>
Applied this patch to the riscv/opensbi repo.
Regards,
Anup
Quoted 98 lines
--- docs/firmware/fw.md | 3 +++ firmware/fw_base.S | 4 +++- firmware/fw_base.ldS | 3 ++- firmware/fw_payload.elf.ldS | 2 +- firmware/objects.mk | 6 ++++++ firmware/payloads/test.elf.ldS | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-)docs/firmware/fw.md +3
-0@@ -61,6 +61,9 @@ Firmware Configuration and Compilation All firmware types support the following common compile time configuration parameters: +* **FW_TEXT_START** - Defines the compile time address of the OpenSBI + firmware. This configuration parameter is optional and assumed to be + `0` if not specified. * **FW_FDT_PATH** - Path to an external flattened device tree binary file to be embedded in the *.rodata* section of the final firmware. If this option is not provided then the firmware will expect the FDT to be passed as anfirmware/fw_base.S +3
-1@@ -53,7 +53,9 @@ _try_lottery: bnez a6, _wait_for_boot_hart /* relocate the global table content */ - lla t2, _fw_start + li t0, FW_TEXT_START /* link start */ + lla t1, _fw_start /* load start */ + sub t2, t1, t0 /* load offset */ lla t0, __rel_dyn_start lla t1, __rel_dyn_end beq t0, t1, _relocate_donefirmware/fw_base.ldS +2
-1@@ -7,7 +7,8 @@ * Anup Patel <[email protected]> */ - /* Don't add any section before _fw_start */ + . = FW_TEXT_START; + /* Don't add any section between FW_TEXT_START and _fw_start */ PROVIDE(_fw_start = .); . = ALIGN(0x1000); /* Need this to create proper sections */firmware/fw_payload.elf.ldS +1
-1@@ -15,7 +15,7 @@ SECTIONS #include "fw_base.ldS" #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endiffirmware/objects.mk +6
-0@@ -13,6 +13,12 @@ firmware-cflags-y += firmware-asflags-y += firmware-ldflags-y += +ifdef FW_TEXT_START +firmware-genflags-y += -DFW_TEXT_START=$(FW_TEXT_START) +else +firmware-genflags-y += -DFW_TEXT_START=0x0 +endif + ifdef FW_FDT_PATH firmware-genflags-y += -DFW_FDT_PATH=\"$(FW_FDT_PATH)\" ifdef FW_FDT_PADDINGfirmware/payloads/test.elf.ldS +1
-2@@ -13,7 +13,7 @@ ENTRY(_start) SECTIONS { #ifdef FW_PAYLOAD_OFFSET - . = FW_PAYLOAD_OFFSET; + . = FW_TEXT_START + FW_PAYLOAD_OFFSET; #else . = ALIGN(FW_PAYLOAD_ALIGN); #endif --2.34.1