Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47602 )
Change subject: [WIP] arch/x86: Use intermediate .id section ......................................................................
[WIP] arch/x86: Use intermediate .id section
The strings in id.S are the same as those defined in lib/version.c. Eliminating the calculation of reverse offsets allows the references across linker sections and dropping the duplicate strings in id.S.
TBD: util/cbfstool needs to post-process and invert the offsets in .id section.
Change-Id: I35d3312336e9c66d657d2ca619cf30fd79e18fd4 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/id.S 1 file changed, 4 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/47602/1
diff --git a/src/arch/x86/id.S b/src/arch/x86/id.S index 4ff397d..545232a 100644 --- a/src/arch/x86/id.S +++ b/src/arch/x86/id.S @@ -4,23 +4,9 @@
.section ".id", "a", @progbits
-ver: - .asciz COREBOOT_VERSION -vendor: - .asciz CONFIG_MAINBOARD_VENDOR -part: - .asciz CONFIG_MAINBOARD_PART_NUMBER - -#if ENV_X86_64 -.long 0xffffffff - ver + 1 /* Reverse offset to the version */ -.long 0xffffffff - vendor + 1 /* Reverse offset to the vendor id */ -.long 0xffffffff - part + 1 /* Reverse offset to the part number */ -#else -.long - ver /* Reverse offset to the version */ -.long - vendor /* Reverse offset to the vendor id */ -.long - part /* Reverse offset to the part number */ -#endif - -.long CONFIG_ROM_SIZE /* Size of this romimage */ +.long coreboot_version /* Reverse offset to the version */ +.long mainboard_vendor /* Reverse offset to the vendor id */ +.long mainboard_part_number /* Reverse offset to the part number */ +.long CONFIG_ROM_SIZE /* Size of this romimage */
.previous