[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/20] build/boot/roms: skip building gnat on fam15h
From: |
Leah Rowe |
Subject: |
[PATCH 09/20] build/boot/roms: skip building gnat on fam15h |
Date: |
Sun, 14 Jan 2024 15:55:26 +0000 |
From: Leah Rowe <leah@libreboot.org>
the fam15h boards do not use libgfxinit, instead deferring
to coreboot's old style of graphics initialisation written in C.
libgfxinit is otherwise the only thing that needs gcc-gnat, so
skip building gcc-gnat on coreboot/fam15h_udimm and rdimm.
neox added crossgcc_ada="n" to board.cfg files before, but
forgot to add the handling of it, so these boards still didn't
build on modern distros, where building the old gnat version
was problematic.
with this patch, those fam15h boards should now build, on modern
distros and modern toolchains. this is done by using
the BUILD_LANGUAGES environmental variable, setting it to c,
which tells coreboot to skip building gcc-gnat.
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
resources/packages/roms_helper/boot | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/resources/packages/roms_helper/boot
b/resources/packages/roms_helper/boot
index 6bd3a6a..1e6e311 100755
--- a/resources/packages/roms_helper/boot
+++ b/resources/packages/roms_helper/boot
@@ -62,9 +62,14 @@ payload_seabios="n"
payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot
menu
seabios_opromloadonly="0"
payload_memtest="n"
+crossgcc_ada="y"
# Override the above defaults using board.cfg
source "resources/coreboot/${board}/board.cfg"
+if [ "${crossgcc_ada}" != "n" ] && [ "${crossgcc_ada}" != "y" ]; then
+ crossgcc_ada="y"
+fi
+
if [ "${grub_scan_disk}" = "undefined" ]; then
printf "build/roms: Target %s does not define grub_scan_disk.
Defaulting to 'both'.\n" "${board}"
grub_scan_disk="both"
@@ -141,12 +146,11 @@ fi
if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
if [ ! -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ]; then
- (
- cat version > "${cbdir}/.coreboot-version"
- cd "${cbdir}"
- make crossgcc-i386 CPUS=$(nproc) # even for 64-bit
machines, coreboot builds
- # 32-bit ROM images, so we only need to worry
about i386-elf
- )
+ cat version > "${cbdir}/.coreboot-version"
+ if [ "${crossgcc_ada}" = "n" ]; then
+ export BUILD_LANGUAGES=c
+ fi
+ make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc)
fi
elif [ "${arch}" = "ARMv7" ]; then
cat version > "${cbdir}/.coreboot-version"
--
2.39.2
- [PATCH 01/20] Use GRUB 2.12, Leah Rowe, 2024/01/14
- [PATCH 03/20] GRUB: Force scancode set 2 with translation, Leah Rowe, 2024/01/14
- [PATCH 05/20] GRUB: Avoid printing frivilous error messages, Leah Rowe, 2024/01/14
- [PATCH 04/20] GRUB: Don't spew "Unknown key 0xFF", Leah Rowe, 2024/01/14
- [PATCH 02/20] Argon2 KDF support in GRUB 2.12, Leah Rowe, 2024/01/14
- [PATCH 06/20] GRUB: Use reduced set of modules, Leah Rowe, 2024/01/14
- [PATCH 07/20] grub.cfg: support ESP, btrfs subvols and extlinux, Leah Rowe, 2024/01/14
- [PATCH 09/20] build/boot/roms: skip building gnat on fam15h,
Leah Rowe <=
- [PATCH 11/20] import util/dell-flash-unlock from lbmk 09bed9a4, Leah Rowe, 2024/01/14
- [PATCH 10/20] NEW MAINBOARD: Dell Latitude E6400, Leah Rowe, 2024/01/14
- [PATCH 14/20] build/boot/roms: support "normal" seabios configs, Leah Rowe, 2024/01/14
- [PATCH 13/20] use seabios revision from canoeboot 20231103, Leah Rowe, 2024/01/14
- [PATCH 12/20] import util/nvmutil from lbmk 09bed9a4, Leah Rowe, 2024/01/14
- [PATCH 15/20] coreboot/e6400_4mb: enable the grub payload, Leah Rowe, 2024/01/14
- [PATCH 08/20] Use newer coreboot revision from canoeboot 102ce12, Leah Rowe, 2024/01/14
- [PATCH 17/20] build/module/grub: disable -Werror on builds, Leah Rowe, 2024/01/14
- [PATCH 18/20] coreboot/fam15h: fix binutils build error on gcc13, Leah Rowe, 2024/01/14
- [PATCH 16/20] cache cbfstool and ifdtool builds, Leah Rowe, 2024/01/14