diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2022-02-14 11:50:01 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-02-15 23:36:02 +0000 |
| commit | 17fbf58fdbde4029ffef5edfb846d4bcafedd3e7 (patch) | |
| tree | 41bc89c6368031a720c7cee2cfc83f8d29e08fc8 /src/arch/x86 | |
| parent | 80ddd29adbad37d83dd37a2d04af67b16e113f99 (diff) | |
Revert "arch/x86/id.S: Fix building with clang"
This reverts commit 0e688b113d7fd98dfdb69cd0a407c8efcd968456.
Reason for revert: Breaks building with GCC 8.3 which is currently
needed to build bootable coreboot images for Ironlake boards:
src/arch/x86/id.S: Assembler messages:
src/arch/x86/id.S:14: Error: value of 4294967344 too large for field of 4 bytes at 48
src/arch/x86/id.S:15: Error: value of 4294967327 too large for field of 4 bytes at 52
src/arch/x86/id.S:16: Error: value of 4294967318 too large for field of 4 bytes at 56
Change-Id: I9e13b15c062bc6598717382b1fedfa120c6d7209
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61926
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/id.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/arch/x86/id.S b/src/arch/x86/id.S index 4a171cc7f6..b569178ab8 100644 --- a/src/arch/x86/id.S +++ b/src/arch/x86/id.S @@ -11,8 +11,14 @@ 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 */ |