7 files changed, 35 insertions, 12 deletions
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 21110e59..32a6e537 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -40,16 +40,16 @@ payloads=""
 keyboard_layouts=""
 while [ $# -gt 0 ]; do
 	case ${1} in
-		-d)
+	-d)
 		displaymodes="${displaymodes}${2}" 
 		shift ;;
-		-p)
+	-p)
 		payloads="${payloads}${2}"
 		shift ;;
-		-k)
+	-k)
 		keyboard_layouts="${keyboard_layouts}${2}"
 		shift ;;
-		*)
+	*)
 		board=${1} ;;
 	esac
 	shift
@@ -84,6 +84,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"
 
@@ -170,7 +172,13 @@ if [ "${blobs_required}" != "n" ] \
 	blobs_required="y"
 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"
@@ -203,6 +211,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
@@ -334,6 +345,19 @@ moverom() {
 		cp ${rompath} ${newrompath}
 	fi
 
+	# pike2008 cards cause a system hang when loading option roms in seabios
+	# if there is an empty option rom in cbfs, no option rom will be loaded
+	if [ "${cuttype}" = "d8d16sas" ]; then
+		emptyrom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
+		rm -f "${emptyrom}"
+		touch "${emptyrom}"
+		for deviceID in "0072" "3050"; do
+			"${cbfstool}" "${newrompath}" add -f "${emptyrom}" \
+					-n pci1000,${deviceID}.rom -t raw
+		done
+		rm -f "${emptyrom}"
+	fi
+
 	for romsize in 4 8 16; do
 		ifdgbe="descriptors/ich9m/ich9fdgbe_${romsize}m.bin"
 		if [ "${cuttype}" = "${romsize}MiB ICH9 IFD NOR flash" ]; then
@@ -390,8 +414,7 @@ mkCoreboot() {
 		printf "Skipping build.\n"
 		return 0
 	fi
-	printf "%s-%s\n" "$(cat projectname)" "$(cat version)" \
-			> "${cbdir}/.coreboot-version"
+	cat version > "${cbdir}/.coreboot-version"
 	(
 		if [ -f "${cbfstool}" ]; then
 			mv "${cbfstool}" "${cbdir}/cbfstool"
diff --git a/resources/scripts/build/dependencies/arch b/resources/scripts/build/dependencies/arch
index c20a1faf..407915e1 100644
--- a/resources/scripts/build/dependencies/arch
+++ b/resources/scripts/build/dependencies/arch
@@ -92,7 +92,7 @@ pacman -S --needed --noconfirm libpciaccess pciutils zlib libftdi \
 # Management engine extraction dependencies
 # ------------------------------------------------------------
 
-pacman -S --needed --noconfirm innoextract p7zip
+pacman -S --needed --noconfirm innoextract p7zip unar
 
 # U-Boot build dependencies
 # ------------------------------------------------------------
diff --git a/resources/scripts/build/dependencies/debian b/resources/scripts/build/dependencies/debian
index fb0ae248..b9ab42e6 100755
--- a/resources/scripts/build/dependencies/debian
+++ b/resources/scripts/build/dependencies/debian
@@ -131,4 +131,4 @@ apt-get -y install libpci-dev pciutils zlib1g-dev libftdi-dev \
 # Blobs building dependencies (for me)
 # ------------------------------------------------------------
 
-apt-get -y install innoextract p7zip p7zip-full
+apt-get -y install innoextract p7zip p7zip-full unar
diff --git a/resources/scripts/build/dependencies/fedora38 b/resources/scripts/build/dependencies/fedora38
index 2389b806..0f852f44 100755
--- a/resources/scripts/build/dependencies/fedora38
+++ b/resources/scripts/build/dependencies/fedora38
@@ -95,4 +95,4 @@ dnf -y install pciutils-devel zlib-devel libftdi-devel gcc libusb-devel
 
 # For extracting IntelME from lenovo updates (X230 etc)
 
-dnf -y install innoextract p7zip p7zip-plugins
+dnf -y install innoextract p7zip p7zip-plugins unar
diff --git a/resources/scripts/build/dependencies/parabola b/resources/scripts/build/dependencies/parabola
index da284bed..4e40b175 100755
--- a/resources/scripts/build/dependencies/parabola
+++ b/resources/scripts/build/dependencies/parabola
@@ -95,7 +95,7 @@ pacman -S --needed --noconfirm libpciaccess pciutils zlib \
 #
 # ------------------------------------------------------------
 
-pacman -S --needed --noconfirm innoextract p7zip
+pacman -S --needed --noconfirm innoextract p7zip unar
 
 # U-Boot build dependencies
 # ------------------------------------------------------------
diff --git a/resources/scripts/build/dependencies/ubuntu2004 b/resources/scripts/build/dependencies/ubuntu2004
index 14a1d8c2..bacb1e46 100755
--- a/resources/scripts/build/dependencies/ubuntu2004
+++ b/resources/scripts/build/dependencies/ubuntu2004
@@ -113,4 +113,4 @@ apt-get -y install libpci-dev pciutils zlib1g-dev libftdi-dev \
 # Blobs building dependencies (for me)
 # ------------------------------------------------------------
 
-apt-get -y install innoextract p7zip p7zip-full
+apt-get -y install innoextract p7zip p7zip-full unar
diff --git a/resources/scripts/build/dependencies/void b/resources/scripts/build/dependencies/void
index e46cd5ee..7ceaafde 100755
--- a/resources/scripts/build/dependencies/void
+++ b/resources/scripts/build/dependencies/void
@@ -88,4 +88,4 @@ xbps-install -y libpciaccess pciutils zlib libftdi1 base-devel libusb
 # Management engine extraction dependencies
 # ------------------------------------------------------------
 
-xbps-install -y innoextract p7zip
+xbps-install -y innoextract p7zip unar