Expand @var@ placeholders in configuration files

This makes configs much less dependent on directory layout. As of this commit the following variables are supported: * @BOARD_BUILD_DIR@ - absolute path under build/ * @BLOB_DIR@ - absolute path to blobs/ Signed-off-by: Sergii Dmytruk <[email protected]>
linuxboot · Aug 25, 2022 · fa8e884 · fa8e884
1 parent c56e9d2
commit fa8e884
Show file tree

Hide file tree

Showing 57 changed files with 189 additions and 182 deletions.
diff --git a/Makefile b/Makefile
@@ -153,6 +153,13 @@ all:
 .SUFFIXES:
 FORCE:
 
+# Copies config while replacing predefined placeholders with actual values
+define install_config =
+	sed -e 's!@BOARD_BUILD_DIR@!$(build)/$(BOARD)!g' \
+	    -e 's!@BLOB_DIR@!$(pwd)/blobs!g' \
+	    "$1" > "$2"
+endef
+
 # Make helpers to operate on lists of things
 # Prefix is "smart" and doesn't add the prefix for absolute file paths
 define prefix =

diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config
@@ -12,7 +12,7 @@ CONFIG_USER_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server-whiptail/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
-CONFIG_LINUX_INITRD="../../build/kgpe-d16_server-whiptail/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config
@@ -13,6 +13,6 @@ CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server/bzImage"
-CONFIG_LINUX_INITRD="../../build/kgpe-d16_server/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
@@ -12,7 +12,7 @@ CONFIG_USER_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation-usb_keyboard/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
-CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation-usb_keyboard/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config
@@ -12,7 +12,7 @@ CONFIG_USER_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
-CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
diff --git a/config/coreboot-librem_13v2.config b/config/coreboot-librem_13v2.config
@@ -8,6 +8,6 @@ CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_skl/cpu
 CONFIG_HAVE_ME_BIN=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_13v2/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2"
-CONFIG_LINUX_INITRD="../../build/librem_13v2/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-librem_13v4.config b/config/coreboot-librem_13v4.config
@@ -8,6 +8,6 @@ CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_kbl/cpu
 CONFIG_HAVE_ME_BIN=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_13v4/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2"
-CONFIG_LINUX_INITRD="../../build/librem_13v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-librem_14.config b/config/coreboot-librem_14.config
@@ -8,6 +8,6 @@ CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu
 CONFIG_HAVE_ME_BIN=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_14/bzImage"
-CONFIG_LINUX_INITRD="../../build/librem_14/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
diff --git a/config/coreboot-librem_15v3.config b/config/coreboot-librem_15v3.config
@@ -8,6 +8,6 @@ CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_skl/cpu
 CONFIG_HAVE_ME_BIN=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_15v3/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2"
-CONFIG_LINUX_INITRD="../../build/librem_15v3/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-librem_15v4.config b/config/coreboot-librem_15v4.config
@@ -8,6 +8,6 @@ CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_kbl/cpu
 CONFIG_HAVE_ME_BIN=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_15v4/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2 video=eDP-1:1920x1080"
-CONFIG_LINUX_INITRD="../../build/librem_15v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-librem_l1um.config b/config/coreboot-librem_l1um.config
@@ -21,6 +21,6 @@ CONFIG_SMBIOS_ENCLOSURE_TYPE=0x17
 CONFIG_USER_TPM1=y
 CONFIG_NO_POST=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_l1um/bzImage"
-CONFIG_LINUX_INITRD="../../build/librem_l1um/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_LINUX_COMMAND_LINE="quiet loglevel=3"
diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config
@@ -9,6 +9,6 @@ CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin"
 CONFIG_HAVE_ME_BIN=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_mini/bzImage"
-CONFIG_LINUX_INITRD="../../build/librem_mini/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
diff --git a/config/coreboot-librem_mini_v2.config b/config/coreboot-librem_mini_v2.config
@@ -8,6 +8,6 @@ CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin"
 CONFIG_HAVE_ME_BIN=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_mini_v2/bzImage"
-CONFIG_LINUX_INITRD="../../build/librem_mini_v2/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
diff --git a/config/coreboot-qemu-fbwhiptail-tpm1-hotp.config b/config/coreboot-qemu-fbwhiptail-tpm1-hotp.config
@@ -15,5 +15,5 @@ CONFIG_USER_TPM1=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/qemu-coreboot-fbwhiptail-tpm1-hotp/bzImage"
-CONFIG_LINUX_INITRD="../../build/qemu-coreboot-fbwhiptail-tpm1-hotp/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-qemu-fbwhiptail.config b/config/coreboot-qemu-fbwhiptail.config
@@ -12,5 +12,5 @@ CONFIG_UART_PCI_ADDR=0
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/qemu-coreboot-fbwhiptail/bzImage"
-CONFIG_LINUX_INITRD="../../build/qemu-coreboot-fbwhiptail/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-qemu-whiptail-tpm1.config b/config/coreboot-qemu-whiptail-tpm1.config
@@ -15,5 +15,5 @@ CONFIG_USER_TPM1=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/qemu-coreboot-whiptail-tpm1/bzImage"
-CONFIG_LINUX_INITRD="../../build/qemu-coreboot-whiptail-tpm1/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-qemu.config b/config/coreboot-qemu.config
@@ -12,5 +12,5 @@ CONFIG_UART_PCI_ADDR=0
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/qemu-coreboot/bzImage"
-CONFIG_LINUX_INITRD="../../build/qemu-coreboot/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t420-hotp-maximized.config b/config/coreboot-t420-hotp-maximized.config
@@ -4,9 +4,9 @@ CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_CBFS_SIZE=0x750000
-CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_LENOVO_T420=y
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
@@ -18,5 +18,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t420-hotp-maximized/bzImage"
-CONFIG_LINUX_INITRD="../../build/t420-hotp-maximized/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config
@@ -4,9 +4,9 @@ CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_CBFS_SIZE=0x750000
-CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_LENOVO_T420=y
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
@@ -18,5 +18,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t420-maximized/bzImage"
-CONFIG_LINUX_INITRD="../../build/t420-maximized/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config
@@ -2,9 +2,9 @@
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_CBFS_SIZE=0x750000
-CONFIG_IFD_BIN_PATH="../../blobs/t420/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/t420/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t420/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/t420/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/t420/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/t420/gbe.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_LENOVO_T420=y
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
@@ -16,5 +16,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t420/bzImage"
-CONFIG_LINUX_INITRD="../../build/t420/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t430-flash.config b/config/coreboot-t430-flash.config
@@ -22,5 +22,5 @@ CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t430-flash/bzImage"
-CONFIG_LINUX_INITRD="../../build/t430-flash/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t430-hotp-maximized.config b/config/coreboot-t430-hotp-maximized.config
@@ -4,9 +4,9 @@ CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_CBFS_SIZE=0xB80000
-CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_LENOVO_THINKPAD_T430=y
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
@@ -18,5 +18,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t430-hotp-maximized/bzImage"
-CONFIG_LINUX_INITRD="../../build/t430-hotp-maximized/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t430-hotp-verification.config b/config/coreboot-t430-hotp-verification.config
@@ -12,5 +12,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t430-hotp-verification/bzImage"
-CONFIG_LINUX_INITRD="../../build/t430-hotp-verification/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config
@@ -4,9 +4,9 @@ CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_CBFS_SIZE=0xB80000
-CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_BOARD_LENOVO_THINKPAD_T430=y
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
@@ -18,5 +18,5 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t430-maximized/bzImage"
-CONFIG_LINUX_INITRD="../../build/t430-maximized/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
diff --git a/config/coreboot-t430.config b/config/coreboot-t430.config
@@ -9,8 +9,8 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t430/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
-CONFIG_LINUX_INITRD="../../build/t430/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
diff --git a/config/coreboot-t520-hotp-maximized.config b/config/coreboot-t520-hotp-maximized.config
@@ -8,16 +8,16 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_BOARD_LENOVO_T520=y
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_NO_POST=y
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t520-hotp-maximized/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/t520-hotp-maximized/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_DEBUG_SMM_RELOCATION=y
diff --git a/config/coreboot-t520-maximized.config b/config/coreboot-t520-maximized.config
@@ -8,16 +8,16 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_BOARD_LENOVO_T520=y
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_NO_POST=y
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t520-maximized/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/t520-maximized/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_DEBUG_SMM_RELOCATION=y
diff --git a/config/coreboot-t530-dgpu-hotp-maximized.config b/config/coreboot-t530-dgpu-hotp-maximized.config
@@ -4,13 +4,13 @@ CONFIG_CBFS_SIZE=0xB80000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_VGA_BIOS_DGPU_ID="10de,0def"
-CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0def.rom"
+CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0def.rom"
 CONFIG_VGA_BIOS=y
-CONFIG_VGA_BIOS_FILE="../../blobs/xx30/8086,0106.rom"
+CONFIG_VGA_BIOS_FILE="@BLOB_DIR@/xx30/8086,0106.rom"
 # CONFIG_VGA_BIOS_SECOND is not set
 CONFIG_VGA_ROM_RUN_DEFAULT=y
 CONFIG_VGA_BIOS_DGPU=y
@@ -23,8 +23,8 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t530-dgpu-hotp-maximized/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
-CONFIG_LINUX_INITRD="../../build/t530-dgpu-hotp-maximized/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config
@@ -4,13 +4,13 @@ CONFIG_CBFS_SIZE=0xB80000
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y
-CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_VGA_BIOS_DGPU_ID="10de,0def"
-CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0def.rom"
+CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0def.rom"
 CONFIG_VGA_BIOS=y
-CONFIG_VGA_BIOS_FILE="../../blobs/xx30/8086,0106.rom"
+CONFIG_VGA_BIOS_FILE="@BLOB_DIR@/xx30/8086,0106.rom"
 # CONFIG_VGA_BIOS_SECOND is not set
 CONFIG_VGA_ROM_RUN_DEFAULT=y
 CONFIG_VGA_BIOS_DGPU=y
@@ -21,8 +21,8 @@ CONFIG_UART_PCI_ADDR=0
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/t530-dgpu-maximized/bzImage"
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
-CONFIG_LINUX_INITRD="../../build/t530-dgpu-maximized/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y