Changes vs #2062 to build EC on top of v0.2.9 nix based docker image independently for v540tu and v560tu (toehr boards missing)

Steal/adapt/reuse as needed to speed things as needed for next feature freeze @macpijan
Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Author: tlaurion

README.md

@@ -460,8 +460,8 @@ docker push "$docker_hub_repo:$docker_version"
 new_digest=$(./docker/get_digest.sh -y "$docker_hub_repo:$docker_version" | tail -n1)
 prev_digest=$(grep '^[^#]' docker/DOCKER_REPRO_DIGEST | head -n1)
 
-# Update the digest in the repository file
-sed -i "s|$prev_digest|$new_digest|" docker/DOCKER_REPRO_DIGEST
+# Update the digest in the repository file and CircleCI config
+sed -i "s|$prev_digest|$new_digest|" docker/DOCKER_REPRO_DIGEST .circleci/config.yml
 
 # Update the version comment in the repository file
 sed -i "s|# Version: .*|# Version: $docker_version|" docker/DOCKER_REPRO_DIGEST

boards/novacustom-v540tu/novacustom-v540tu.config

@@ -15,6 +15,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=dasharo
+export CONFIG_DASHARO_EC=y
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v540tu.config

boards/novacustom-v560tu/novacustom-v560tu.config

@@ -15,6 +15,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=dasharo
+export CONFIG_DASHARO_EC=y
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v560tu.config

config/coreboot-nitropad-ns50.config

@@ -6,7 +6,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="novacustom_v56x_mtl_igpu_v1.0.1-rc3"
+CONFIG_LOCALVERSION="novacustom_v56x_mtl_igpu_v1.0.1"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set

config/coreboot-novacustom-nv4x_adl.config

@@ -6,7 +6,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="v1.8.0-rc4"
+CONFIG_LOCALVERSION="novacustom_v56x_mtl_igpu_v1.0.1"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set

config/coreboot-novacustom-v540tu.config

@@ -6,7 +6,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="v1.0.1-rc3"
+CONFIG_LOCALVERSION="novacustom_v56x_mtl_igpu_v1.0.1"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -553,7 +553,8 @@ CONFIG_RCBA_LENGTH=0x4000
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_DASHARO_EC=y
-# CONFIG_EC_DASHARO_EC_UPDATE is not set
+CONFIG_EC_DASHARO_EC_UPDATE=y
+CONFIG_EC_DASHARO_EC_UPDATE_FILE="@COREBOOT_BUILD_DIR@/ec.rom"
 
 #
 # Intel Firmware

config/coreboot-novacustom-v560tu.config

@@ -6,7 +6,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="v1.0.1-rc3"
+CONFIG_LOCALVERSION="novacustom_v56x_mtl_igpu_v1.0.1"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -553,7 +553,8 @@ CONFIG_RCBA_LENGTH=0x4000
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_DASHARO_EC=y
-# CONFIG_EC_DASHARO_EC_UPDATE is not set
+CONFIG_EC_DASHARO_EC_UPDATE=y
+CONFIG_EC_DASHARO_EC_UPDATE_FILE="@COREBOOT_BUILD_DIR@/ec.rom"
 
 #
 # Intel Firmware

modules/coreboot

@@ -1,6 +1,6 @@
 ifeq "$(CONFIG_COREBOOT)" "y"
 
-CONFIG_COREBOOT_ROM			?= coreboot.rom
+CONFIG_COREBOOT_ROM		?= coreboot.rom
 CONFIG_COREBOOT_BOOTBLOCK	?=
 
 ifeq "$(CONFIG_TARGET_ARCH)" "x86"
@@ -131,6 +131,7 @@ coreboot_dir := $($(coreboot_module)_dir)
 coreboot_base_dir := $($(coreboot_module)_base_dir)
 
 $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs)
+$(coreboot_module)_depends += $(if $(CONFIG_DASHARO_EC), dasharo-ec)
 
 # coreboot builds are specialized on a per-target basis.
 # The builds are done in a per-target subdirectory
@@ -167,6 +168,7 @@ $(coreboot_module)_configure := \
 		sed -i '/^CONFIG_MAINBOARD_SMBIOS_MANUFACTURER/d' $(build)/$(coreboot_dir)/.config; \
 		echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config; \
 	fi; \
+	sed -i 's|@COREBOOT_BUILD_DIR@|$(build)/$(coreboot_dir)|g' "$(build)/$(coreboot_dir)/.config"; \
 	$(MAKE) olddefconfig \
 		-C "$(build)/$(coreboot_base_dir)" \
 		obj="$(build)/$(coreboot_dir)" \
@@ -285,7 +287,7 @@ coreboot.save_in_defconfig_format_in_place:
 		olddefconfig && \
 	$(MAKE) \
 		-C "$(build)/$(coreboot_base_dir)" \
- 		DOTCONFIG="$(build)/$(coreboot_dir)/.config" \
+		DOTCONFIG="$(build)/$(coreboot_dir)/.config" \
 		savedefconfig && \
 	mv "$(build)/$(coreboot_base_dir)/defconfig" "$(pwd)/$(CONFIG_COREBOOT_CONFIG)"
 

modules/dasharo-ec

@@ -0,0 +1,46 @@
+ifeq "$(CONFIG_DASHARO_EC)" "y"
+
+modules-y += dasharo-ec
+
+dasharo-ec_repo        := https://github.com/Dasharo/ec
+dasharo-ec_commit_hash := d198b641195e60e13afc17be9464e4f402d1c2fa
+
+# system76/ec uses slash-separated BOARD paths (src/board/novacustom/v540tu/)
+ifeq "$(BOARD)" "novacustom-v540tu"
+DASHARO_EC_BOARD_MODEL := novacustom/v540tu
+else ifeq "$(BOARD)" "novacustom-v560tu"
+DASHARO_EC_BOARD_MODEL := novacustom/v560tu
+else
+$(error "$(BOARD): no Dasharo EC board model mapping defined")
+endif
+
+dasharo-ec_version  := $(dasharo-ec_commit_hash)
+dasharo-ec_base_dir := dasharo-ec-$(dasharo-ec_version)
+dasharo-ec_dir      := dasharo-ec-$(dasharo-ec_version)
+
+# definemodule checks that this file exists after _target runs
+dasharo-ec_output := .built
+
+# definemodule runs: ( echo "..." ; $(MAKE) -C $(build)/$(dasharo-ec_dir) $(dasharo-ec_target) ) | tee log
+# The whole expansion is a subshell, so && is valid shell inside it.
+# BOARD=... is passed to the upstream EC Makefile as a variable override.
+# Touch .built so definemodule's output sentinel is satisfied.
+dasharo-ec_target := \
+	BOARD=$(DASHARO_EC_BOARD_MODEL) \
+	&& touch "$(build)/$(dasharo-ec_dir)/.built"
+
+# After dasharo-ec/.build sentinel is touched by definemodule, copy ec.rom into
+# the per-board coreboot build dir. The datestamped subdir is matched with glob.
+# $(coreboot_dir) = coreboot-dasharo/$(BOARD) — defined in modules/coreboot.
+$(build)/$(coreboot_dir)/ec.rom: $(build)/$(dasharo-ec_dir)/.build
+	$(call do,EC-ROM,$(DASHARO_EC_BOARD_MODEL) -> $(coreboot_dir)/ec.rom, \
+		mkdir -p "$(build)/$(coreboot_dir)" \
+		&& sh -c 'cp "$(build)/$(dasharo-ec_dir)/build/$(DASHARO_EC_BOARD_MODEL)"/*/ec.rom \
+		          "$(build)/$(coreboot_dir)/ec.rom"' \
+	)
+
+# Append ec.rom as prerequisite to coreboot configure without redefining recipe.
+# Guarantees coreboot configure runs only after ec.rom is in place.
+$(build)/$(coreboot_dir)/.configured: $(build)/$(coreboot_dir)/ec.rom
+
+endif