GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Remove ID_SECTION_OFFSET 

The location is hardcoded inside flashrom and FILO.
Only two offsets are supported, 0x10 and 0x80.

Change-Id: I8348f2ac0cab969ab78ecb50a55de486eee0cf9b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47598
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-04-23 18:45:28 +03:00 committed by Hung-Te Lin
parent f0a9142b24
commit b19d9511f9
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/ppc64/Kconfig
View File

@ -17,3 +17,7 @@ config ARCH_ROMSTAGE_PPC64
config ARCH_RAMSTAGE_PPC64 config ARCH_RAMSTAGE_PPC64
bool bool
select ARCH_PPC64 select ARCH_PPC64
config ID_SECTION_OFFSET
hex
default 0x80

4
src/arch/x86/Kconfig
View File

@ -186,10 +186,6 @@ config HPET_ADDRESS
hex hex
default 0xfed00000 if !HPET_ADDRESS_OVERRIDE default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
config ID_SECTION_OFFSET
hex
default 0x80
# 64KiB default bootblock size # 64KiB default bootblock size
config C_ENV_BOOTBLOCK_SIZE config C_ENV_BOOTBLOCK_SIZE
hex hex

3
src/arch/x86/bootblock.ld
View File

@ -15,10 +15,11 @@ SECTIONS {
/* Trigger an error if I have an unusable start address */ /* Trigger an error if I have an unusable start address */
_bogus = ASSERT(_start16bit >= 0xffff0000, "_start16bit too low. Please report."); _bogus = ASSERT(_start16bit >= 0xffff0000, "_start16bit too low. Please report.");
. = (0xffffffff - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start) + 1; . = _ID_SECTION;
.id (.): { .id (.): {
KEEP(*(.id)); KEEP(*(.id));
} }
_ID_SECTION = 0xffffff80 - SIZEOF(.id);
. = 0xffffffc0; . = 0xffffffc0;
.fit_pointer (.): { .fit_pointer (.): {

27
src/arch/x86/id.S
View File

@ -2,26 +2,23 @@
#include <build.h> #include <build.h>
.section ".id", "a", @progbits .section ".id", "a", @progbits
.globl __id_start
__id_start:
ver: ver:
.asciz COREBOOT_VERSION .asciz COREBOOT_VERSION
vendor: vendor:
.asciz CONFIG_MAINBOARD_VENDOR .asciz CONFIG_MAINBOARD_VENDOR
part: part:
.asciz CONFIG_MAINBOARD_PART_NUMBER .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: #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 */