From d3ec7d7ba90feaea31d5b25dbef8a5a5be177176 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Fri, 8 Nov 2024 07:35:39 -0500
Subject: [PATCH] talos-2: fix buildsystem: make paths dynamic for this board
 so board name can change over time

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
---
 Makefile                    | 6 +++---
 config/linux-talos-2.config | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ff814647..e5334097 100644
--- a/Makefile
+++ b/Makefile
@@ -231,9 +231,9 @@ ifeq ($(CONFIG_COREBOOT), y)
 # Legacy flash boards don't generate an update package, the only purpose of
 # those boards is to be flashed over vendor firmware via an exploit.
 ifneq ($(CONFIG_LEGACY_FLASH), y)
-# talos-2 builds its own update package, which is not integrated with the ZIP
-# method currently
-ifneq ($(BOARD), talos-2)
+# Boards containing 'talos-2' build their own update package, which is not integrated with the ZIP method currently
+ifneq ($(findstring talos-2, $(BOARD)),)
+else
 # Coreboot targets create an update package that can be applied with integrity
 # verification before flashing (see flash-gui.sh).  The ZIP package format
 # allows other metadata that might be needed to added in the future without
diff --git a/config/linux-talos-2.config b/config/linux-talos-2.config
index f42b657b..a4d82665 100644
--- a/config/linux-talos-2.config
+++ b/config/linux-talos-2.config
@@ -128,7 +128,7 @@ CONFIG_CC_HAS_INT128=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../talos-2/initrd.cpio"
+CONFIG_INITRAMFS_SOURCE="../@BOARD_BUILD_DIR@/initrd.cpio"
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_ROOT_GID=0
 # CONFIG_RD_GZIP is not set