Skip to content

Commit d3ec7d7

Browse files
committed
talos-2: fix buildsystem: make paths dynamic for this board so board name can change over time
Signed-off-by: Thierry Laurion <[email protected]>
1 parent 2a8cc11 commit d3ec7d7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ ifeq ($(CONFIG_COREBOOT), y)
231231
# Legacy flash boards don't generate an update package, the only purpose of
232232
# those boards is to be flashed over vendor firmware via an exploit.
233233
ifneq ($(CONFIG_LEGACY_FLASH), y)
234-
# talos-2 builds its own update package, which is not integrated with the ZIP
235-
# method currently
236-
ifneq ($(BOARD), talos-2)
234+
# Boards containing 'talos-2' build their own update package, which is not integrated with the ZIP method currently
235+
ifneq ($(findstring talos-2, $(BOARD)),)
236+
else
237237
# Coreboot targets create an update package that can be applied with integrity
238238
# verification before flashing (see flash-gui.sh). The ZIP package format
239239
# allows other metadata that might be needed to added in the future without

config/linux-talos-2.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ CONFIG_CC_HAS_INT128=y
128128
# CONFIG_SYSFS_DEPRECATED is not set
129129
CONFIG_RELAY=y
130130
CONFIG_BLK_DEV_INITRD=y
131-
CONFIG_INITRAMFS_SOURCE="../../talos-2/initrd.cpio"
131+
CONFIG_INITRAMFS_SOURCE="../@BOARD_BUILD_DIR@/initrd.cpio"
132132
CONFIG_INITRAMFS_ROOT_UID=0
133133
CONFIG_INITRAMFS_ROOT_GID=0
134134
# CONFIG_RD_GZIP is not set

0 commit comments

Comments
 (0)