starlabs: make compact profiles self-contained

Signed-off-by: Sean Rhodes <sean@starlabs.systems>

Author: Sean-StarLabs

Makefile

@@ -470,7 +470,7 @@ define define_module =
   $(eval $1_module_file = $(or $($1_module_file),$1))
 
   ifneq ("$($1_repo)","")
-    $(eval $1_patch_name = $1$(if $($1_patch_version),-$($1_patch_version),))
+    $(eval $1_patch_name = $(or $($1_patch_name_override),$1$(if $($1_patch_version),-$($1_patch_version),)))
     # First time:
     #   Checkout the tree instead and create the canary file with repo and
     #   revision so that we know that the files are all present and their
@@ -559,7 +559,7 @@ define define_module =
     # the version a second time.  (The '-' separator is also omitted then.)
     # $1_patch_version can still be defined manually.
     $(eval $1_patch_version ?= $(if $(filter %-$($1_version),$1),,$($1_version)))
-    $(eval $1_patch_name = $1$(if $($1_patch_version),-,)$($1_patch_version))
+    $(eval $1_patch_name = $(or $($1_patch_name_override),$1$(if $($1_patch_version),-,)$($1_patch_version)))
     # Fetch and verify the source tar file
     # wget creates it early, so we have to cleanup if it fails
     $(packages)/$($1_tar):

initrd/bin/kexec-boot.sh

@@ -212,7 +212,7 @@ if [ -x /bin/io386 -a "$CONFIG_FINALIZE_PLATFORM_LOCKING" = "y" ]; then
 	lock_chip.sh
 fi
 
-if [ "$CONFIG_BRAND_NAME" = "Heads" ]; then
+if [ "$CONFIG_BRAND_NAME" = "Heads" ] && [ -x /bin/qrenc ]; then
 	STATUS_OK "Heads firmware job done - handing off to your OS. Consider donating: https://opencollective.com/insurgo"
 	qrenc "https://opencollective.com/insurgo"
 else

modules/busybox

@@ -1,21 +1,43 @@
 # Busybox is always included, unless explicitly turned off
 CONFIG_BUSYBOX ?= y
-modules-$(CONFIG_BUSYBOX) += busybox
-
-busybox_version := 1.36.1
-busybox_dir := busybox-$(busybox_version)
-busybox_tar := busybox-$(busybox_version).tar.bz2
-busybox_url := https://busybox.net/downloads/$(busybox_tar)
-busybox_hash := b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
-
-busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig
-busybox_config := config/busybox.config
-busybox_output := busybox
-busybox_target := \
+
+ifeq "$(CONFIG_BUSYBOX_COMPACT)" "y"
+busybox_module := busybox-compact
+else
+busybox_module := busybox
+endif
+
+modules-$(CONFIG_BUSYBOX) += $(busybox_module)
+
+$(busybox_module)_version := 1.36.1
+$(busybox_module)_dir := $(busybox_module)-$($(busybox_module)_version)
+$(busybox_module)_tar := busybox-$($(busybox_module)_version).tar.bz2
+$(busybox_module)_url := https://busybox.net/downloads/$($(busybox_module)_tar)
+$(busybox_module)_hash := b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
+$(busybox_module)_module_file := busybox
+$(busybox_module)_patch_name_override := busybox-1.36.1
+$(busybox_module)_depends := $(musl_dep)
+
+$(busybox_module)_configure := \
+	$(if $(filter y,$(CONFIG_BUSYBOX_COMPACT)), \
+		for symbol in \
+			I2CGET I2CSET I2CDUMP I2CDETECT \
+			ARP IFCONFIG IP NC NSLOOKUP NTPD PING ROUTE SSL_CLIENT \
+			TFTP TLS VCONFIG WGET UDHCPC; do \
+			sed -i "s/^CONFIG_$$$${symbol}=y$$$$/# CONFIG_$$$${symbol} is not set/" .config; \
+		done; \
+		sed -i 's/^# CONFIG_LSPCI is not set$$$$/CONFIG_LSPCI=y/' .config; \
+	) \
+	$(MAKE) CC="$(heads_cc)" oldconfig
+$(busybox_module)_config := config/busybox.config
+$(busybox_module)_output := busybox
+$(busybox_module)_target := \
 	$(CROSS_TOOLS) \
 	$(MAKE_JOBS) \
 	SOURCE_DATE_EPOCH=0 \
 
+busybox_dir := $($(busybox_module)_dir)
+
 # For reproducibility, busybox is linked without --gc-sections.
 # SEE: patches/busybox-1.36.1/0004-trylink-reproducible.patch
 # patches scripts/trylink to skip --gc-sections when SOURCE_DATE_EPOCH
@@ -52,6 +74,3 @@ $(initrd_bin_dir)/busybox: $(build)/$(busybox_dir)/.build
 		$(VERBOSE_REDIRECT) \
 	)
 	@touch $< # ensure that our build file is still newer
-
-
-busybox_depends := $(musl_dep)

modules/pciutils

@@ -1,4 +1,5 @@
 modules-$(CONFIG_PCIUTILS) += pciutils
+modules-$(CONFIG_PCIUTILS_LIB_ONLY) += pciutils
 
 pciutils_depends := $(musl_dep)
 

tests/starlabs/test_compact_profile.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -euo pipefail
+
+repo_root=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
+
+grep -F 'modules-$(CONFIG_PCIUTILS_LIB_ONLY) += pciutils' \
+	"$repo_root/modules/pciutils" >/dev/null
+grep -F 'busybox_module := busybox-compact' \
+	"$repo_root/modules/busybox" >/dev/null
+grep -F '$(busybox_module)_patch_name_override := busybox-1.36.1' \
+	"$repo_root/modules/busybox" >/dev/null
+grep -F '$(busybox_module)_depends := $(musl_dep)' \
+	"$repo_root/modules/busybox" >/dev/null
+grep -F 'CONFIG_LSPCI=y' "$repo_root/modules/busybox" >/dev/null
+
+for applet in ARP I2CGET PING TLS WGET UDHCPC; do
+	grep -qw "$applet" "$repo_root/modules/busybox"
+done
+
+grep -F 'if [ "$CONFIG_BRAND_NAME" = "Heads" ] && [ -x /bin/qrenc ]; then' \
+	"$repo_root/initrd/bin/kexec-boot.sh" >/dev/null
+
+while IFS=: read -r config size; do
+	if (( size > 0x1000000 )); then
+		echo "$config exceeds the 16 MiB CBFS decode window" >&2
+		exit 1
+	fi
+done < <(grep -H '^CONFIG_CBFS_SIZE=' \
+	"$repo_root"/config/coreboot-starlabs_*.config | \
+	sed 's/:CONFIG_CBFS_SIZE=/:/')
+
+if grep -R -q '^export CONFIG_CBFS_VIA_FLASHPROG=y' \
+	"$repo_root/boards/starlabs"; then
+	echo "Star Labs boards must keep CBFS in the memory-mapped window" >&2
+	exit 1
+fi
+
+echo "Star Labs compact profile tests passed"