From b55cc19f41b5995f616e58af49bb84b79d5167e1 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Jul 2023 11:06:33 +0100 Subject: coreboot: AMD Fam10/15: don't build GCC-GNAT do this with board.cfg option: crossgcc_ada="n" add this environmental variable when building crossgcc, if crossgcc_ada="n": BUILD_LANGUAGES=c This avoids building the GNAT/Ada compiler in GCC. Coreboot 4.11 is only used for some AGESA boards that don't need Ada (their video init is the old style, written in C, it's not libgfxinit) Signed-off-by: Leah Rowe --- resources/coreboot/fam15h_rdimm/board.cfg | 1 + resources/coreboot/fam15h_udimm/board.cfg | 1 + resources/coreboot/kcma-d8-rdimm_16mb/board.cfg | 1 + resources/coreboot/kcma-d8-rdimm_2mb/board.cfg | 1 + resources/coreboot/kcma-d8-udimm_16mb/board.cfg | 1 + resources/coreboot/kcma-d8-udimm_2mb/board.cfg | 1 + resources/coreboot/kfsn4-dre_1mb/board.cfg | 1 + resources/coreboot/kfsn4-dre_2mb/board.cfg | 1 + resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg | 1 + resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg | 1 + resources/coreboot/kgpe-d16-udimm_16mb/board.cfg | 1 + resources/coreboot/kgpe-d16-udimm_2mb/board.cfg | 1 + resources/scripts/build/boot/roms_helper | 11 +++++++++++ 13 files changed, 23 insertions(+) (limited to 'resources') diff --git a/resources/coreboot/fam15h_rdimm/board.cfg b/resources/coreboot/fam15h_rdimm/board.cfg index b1b7c28f..fcaef28c 100644 --- a/resources/coreboot/fam15h_rdimm/board.cfg +++ b/resources/coreboot/fam15h_rdimm/board.cfg @@ -6,3 +6,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="n" payload_memtest="n" +crossgcc_ada="n" diff --git a/resources/coreboot/fam15h_udimm/board.cfg b/resources/coreboot/fam15h_udimm/board.cfg index 850ac1d2..aa000196 100644 --- a/resources/coreboot/fam15h_udimm/board.cfg +++ b/resources/coreboot/fam15h_udimm/board.cfg @@ -6,3 +6,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="n" payload_memtest="n" +crossgcc_ada="n" diff --git a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg index ced4feb4..d6c1c4ff 100644 --- a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg +++ b/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg index ced4feb4..d6c1c4ff 100644 --- a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg +++ b/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg b/resources/coreboot/kcma-d8-udimm_16mb/board.cfg index 90caa033..9680f8e7 100644 --- a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg +++ b/resources/coreboot/kcma-d8-udimm_16mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg b/resources/coreboot/kcma-d8-udimm_2mb/board.cfg index 90caa033..9680f8e7 100644 --- a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg +++ b/resources/coreboot/kcma-d8-udimm_2mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kfsn4-dre_1mb/board.cfg b/resources/coreboot/kfsn4-dre_1mb/board.cfg index c8686606..80eff4b5 100644 --- a/resources/coreboot/kfsn4-dre_1mb/board.cfg +++ b/resources/coreboot/kfsn4-dre_1mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kfsn4-dre_2mb/board.cfg b/resources/coreboot/kfsn4-dre_2mb/board.cfg index c8686606..80eff4b5 100644 --- a/resources/coreboot/kfsn4-dre_2mb/board.cfg +++ b/resources/coreboot/kfsn4-dre_2mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg index ced4feb4..d6c1c4ff 100644 --- a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg +++ b/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg index ced4feb4..d6c1c4ff 100644 --- a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg +++ b/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg index 90caa033..9680f8e7 100644 --- a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg +++ b/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg index 90caa033..9680f8e7 100644 --- a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg +++ b/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" +crossgcc_ada="n" diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 5ac65c61..129c2f7a 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -81,6 +81,8 @@ seabios_opromloadonly="0" payload_memtest="n" payload_uboot="n" uboot_config="undefined" +# ditto option whether to compile ada in crossgcc: +crossgcc_ada="y" # yes by default # Override the above defaults using board.cfg . "resources/coreboot/${board}/board.cfg" @@ -158,7 +160,13 @@ if [ "${payload_uboot}" = "y" ] && \ uboot_config="default" fi +# ada support needed for libgfxinit submodule +if [ "${crossgcc_ada}" != "y" ] && [ "${crossgcc_ada}" != "n" ]; then + crossgcc_ada="y" +fi + # Override all payload directives with cmdline args +# (do not override crossgcc_ada) if [ ! -z ${payloads} ]; then echo "setting payloads $payloads" payload_grub="n" @@ -191,6 +199,9 @@ fi cat version > "${cbdir}/.coreboot-version" +if [ "${crossgcc_ada}" = "n" ]; then + export BUILD_LANGUAGES=c +fi if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then if [ ! -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ]; then # Even for 64-bit machines, coreboot builds 32-bit ROM -- cgit v1.2.1