Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40787 )
Change subject: [WIP] arch/x86: Remove ID_SECTION_OFFSET ......................................................................
[WIP] arch/x86: Remove ID_SECTION_OFFSET
The location is hardcoded inside flashrom at least and currently there is no platform that needs to locate it elsewhere.
Change-Id: I8348f2ac0cab969ab78ecb50a55de486eee0cf9b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/Kconfig M src/arch/x86/id.S M src/cpu/x86/16bit/reset16.ld 3 files changed, 10 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/40787/1
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 21107aa..af232bf 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -182,10 +182,6 @@ hex default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
-config ID_SECTION_OFFSET - hex - default 0x80 - # 64KiB default bootblock size config C_ENV_BOOTBLOCK_SIZE hex diff --git a/src/arch/x86/id.S b/src/arch/x86/id.S index dd447e6..e38c4ef 100644 --- a/src/arch/x86/id.S +++ b/src/arch/x86/id.S @@ -3,27 +3,18 @@
#include <build.h>
- .section ".id", "a", @progbits +.section ".id", "a", @progbits
- .globl __id_start -__id_start: ver: .asciz COREBOOT_VERSION vendor: .asciz CONFIG_MAINBOARD_VENDOR part: .asciz CONFIG_MAINBOARD_PART_NUMBER -.long __id_end + CONFIG_ID_SECTION_OFFSET - ver /* Reverse offset to the - *vendor id - */ -.long __id_end + CONFIG_ID_SECTION_OFFSET - vendor /* Reverse offset to the - * vendor id - */ -.long __id_end + CONFIG_ID_SECTION_OFFSET - part /* Reverse offset to the - * part number - */ -.long CONFIG_ROM_SIZE /* Size of this romimage */ - .globl __id_end
-__id_end: +.long - ver /* Reverse offset to the version */ +.long - vendor /* Reverse offset to the vendor id */ +.long - part /* Reverse offset to the part number */ +.long CONFIG_ROM_SIZE /* Size of this romimage */ + .previous diff --git a/src/cpu/x86/16bit/reset16.ld b/src/cpu/x86/16bit/reset16.ld index 5da3213..800629b 100644 --- a/src/cpu/x86/16bit/reset16.ld +++ b/src/cpu/x86/16bit/reset16.ld @@ -17,10 +17,11 @@ _TOO_LOW = CONFIG_X86_RESET_VECTOR - 0xfff0; _bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report.");
- . = (CONFIG_X86_RESET_VECTOR - CONFIG_ID_SECTION_OFFSET) + 0x10 - (__id_end - __id_start); + . = ID_SECTION; .id (.): { KEEP(*(.id)) } + ID_SECTION = BOOTBLOCK_END - 0x80 + 1 - SIZEOF(.id);
#if CONFIG(CPU_INTEL_FIRMWARE_INTERFACE_TABLE) . = 0xffffffc0; @@ -35,4 +36,6 @@ . = 15; BYTE(0x00); } + + BOOTBLOCK_END = CONFIG_X86_RESET_VECTOR - 1 + 0x10; }