From fa8e8843c6ad0a29d34e95ba4d364053c8c78fe5 Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Tue, 16 Aug 2022 19:39:33 +0300 Subject: [PATCH] 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 --- Makefile | 7 +++++++ config/coreboot-kgpe-d16_server-whiptail.config | 4 ++-- config/coreboot-kgpe-d16_server.config | 4 ++-- ...reboot-kgpe-d16_workstation-usb_keyboard.config | 4 ++-- config/coreboot-kgpe-d16_workstation.config | 4 ++-- config/coreboot-librem_13v2.config | 4 ++-- config/coreboot-librem_13v4.config | 4 ++-- config/coreboot-librem_14.config | 4 ++-- config/coreboot-librem_15v3.config | 4 ++-- config/coreboot-librem_15v4.config | 4 ++-- config/coreboot-librem_l1um.config | 4 ++-- config/coreboot-librem_mini.config | 4 ++-- config/coreboot-librem_mini_v2.config | 4 ++-- config/coreboot-qemu-fbwhiptail-tpm1-hotp.config | 4 ++-- config/coreboot-qemu-fbwhiptail.config | 4 ++-- config/coreboot-qemu-whiptail-tpm1.config | 4 ++-- config/coreboot-qemu.config | 4 ++-- config/coreboot-t420-hotp-maximized.config | 10 +++++----- config/coreboot-t420-maximized.config | 10 +++++----- config/coreboot-t420.config | 10 +++++----- config/coreboot-t430-flash.config | 4 ++-- config/coreboot-t430-hotp-maximized.config | 10 +++++----- config/coreboot-t430-hotp-verification.config | 4 ++-- config/coreboot-t430-maximized.config | 10 +++++----- config/coreboot-t430.config | 4 ++-- config/coreboot-t520-hotp-maximized.config | 10 +++++----- config/coreboot-t520-maximized.config | 10 +++++----- config/coreboot-t530-dgpu-hotp-maximized.config | 14 +++++++------- config/coreboot-t530-dgpu-maximized.config | 14 +++++++------- config/coreboot-t530-hotp-maximized.config | 10 +++++----- config/coreboot-t530-maximized.config | 10 +++++----- ...coreboot-w530-dgpu-K1000m-hotp-maximized.config | 14 +++++++------- config/coreboot-w530-dgpu-K1000m-maximized.config | 14 +++++++------- ...coreboot-w530-dgpu-K2000m-hotp-maximized.config | 14 +++++++------- config/coreboot-w530-dgpu-K2000m-maximized.config | 14 +++++++------- config/coreboot-w530-hotp-maximized.config | 10 +++++----- config/coreboot-w530-maximized.config | 10 +++++----- config/coreboot-x220-hotp-maximized.config | 10 +++++----- config/coreboot-x220-maximized.config | 10 +++++----- config/coreboot-x220.config | 10 +++++----- config/coreboot-x230-flash.config | 4 ++-- config/coreboot-x230-hotp-maximized.config | 10 +++++----- config/coreboot-x230-hotp-maximized_usb-kb.config | 10 +++++----- config/coreboot-x230-hotp-verification.config | 4 ++-- config/coreboot-x230-maximized.config | 10 +++++----- config/coreboot-x230.config | 4 ++-- config/linux-kgpe-d16_server-whiptail.config | 2 +- config/linux-kgpe-d16_server.config | 2 +- config/linux-kgpe-d16_workstation.config | 2 +- config/linux-librem_common.config | 2 +- config/linux-linuxboot.config | 2 +- config/linux-qemu.config | 2 +- config/linux-x230-flash.config | 2 +- config/linux-x230-legacy.config | 2 +- config/linux-x230-maximized.config | 2 +- modules/coreboot | 2 +- modules/linux | 2 +- 57 files changed, 189 insertions(+), 182 deletions(-) diff --git a/Makefile b/Makefile index a4013d4b..eb89c4c6 100644 --- 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 index f3bfa2ae..d8be2b93 100644 --- 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 index 1a18ded6..f8e5c311 100644 --- 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 index 00ccf384..d8be2b93 100644 --- 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 index 0fb62327..d8be2b93 100644 --- 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 index 12f22f9d..53fd4686 100644 --- 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 index 439f9c36..4988622d 100644 --- 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 index c2450ac3..c98c0c31 100644 --- 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 index 6f73b45b..2c6014cf 100644 --- 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 index ff8215cc..f58758c2 100644 --- 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 index 403ad8b9..97a68a3f 100644 --- 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 index b75e2171..548d0852 100644 --- 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 index 4403278d..f48386f8 100644 --- 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 index 6e16a6d8..38f6c316 100644 --- 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 index 5952dad0..a8abeb34 100644 --- 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 index b6e14479..38f6c316 100644 --- 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 index 9aed5622..9f1e614d 100644 --- 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 index c3bf1836..cb455264 100644 --- 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 index 81168016..cb455264 100644 --- 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 index e5a38b43..d7ddb802 100644 --- 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 index 75ab9d31..d018f48e 100644 --- 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 index 597055fd..e4030691 100644 --- 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 index effc5e77..74064083 100644 --- 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 index 2903f3d4..a4925975 100644 --- 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 index cd717766..7b20193e 100644 --- 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 index 68ae4a6d..981f1080 100644 --- 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 index f1d348c4..981f1080 100644 --- 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 index fb88c8f7..25d821b9 100644 --- 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 index 5ff5e3f3..a09b3c01 100644 --- 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 diff --git a/config/coreboot-t530-hotp-maximized.config b/config/coreboot-t530-hotp-maximized.config index 8f759fec..967f2d01 100644 --- a/config/coreboot-t530-hotp-maximized.config +++ b/config/coreboot-t530-hotp-maximized.config @@ -4,9 +4,9 @@ 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_BOARD_LENOVO_T530=y CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 @@ -16,8 +16,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-hotp-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/t530-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-maximized.config b/config/coreboot-t530-maximized.config index 7aca922a..6256a157 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -4,9 +4,9 @@ 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_BOARD_LENOVO_T530=y CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 @@ -16,8 +16,8 @@ CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/t530-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/t530-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-w530-dgpu-K1000m-hotp-maximized.config b/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config index 90b50ffd..a639890a 100644 --- a/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config +++ b/config/coreboot-w530-dgpu-K1000m-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,0ffc" -CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0ffc.rom" +CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0ffc.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/w530-dgpu-K1000m-hotp-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-dgpu-K1000m-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-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config index 98fdfb14..a639890a 100644 --- a/config/coreboot-w530-dgpu-K1000m-maximized.config +++ b/config/coreboot-w530-dgpu-K1000m-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,0ffc" -CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0ffc.rom" +CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0ffc.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/w530-dgpu-K1000m-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-dgpu-K1000m-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-w530-dgpu-K2000m-hotp-maximized.config b/config/coreboot-w530-dgpu-K2000m-hotp-maximized.config index 2365eee1..6d9ceb1b 100644 --- a/config/coreboot-w530-dgpu-K2000m-hotp-maximized.config +++ b/config/coreboot-w530-dgpu-K2000m-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,0ffb" -CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0ffb.rom" +CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0ffb.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/w530-dgpu-K2000m-hotp-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-dgpu-K2000m-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-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config index 666c2eff..6d9ceb1b 100644 --- a/config/coreboot-w530-dgpu-K2000m-maximized.config +++ b/config/coreboot-w530-dgpu-K2000m-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,0ffb" -CONFIG_VGA_BIOS_DGPU_FILE="../../blobs/xx30/10de,0ffb.rom" +CONFIG_VGA_BIOS_DGPU_FILE="@BLOB_DIR@/xx30/10de,0ffb.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/w530-dgpu-K2000m-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-dgpu-K2000m-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-w530-hotp-maximized.config b/config/coreboot-w530-hotp-maximized.config index 54313a99..79aaa977 100644 --- a/config/coreboot-w530-hotp-maximized.config +++ b/config/coreboot-w530-hotp-maximized.config @@ -4,9 +4,9 @@ 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_BOARD_LENOVO_W530=y CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 @@ -16,8 +16,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/w530-hotp-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-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-w530-maximized.config b/config/coreboot-w530-maximized.config index 06934316..79aaa977 100644 --- a/config/coreboot-w530-maximized.config +++ b/config/coreboot-w530-maximized.config @@ -4,9 +4,9 @@ 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_BOARD_LENOVO_W530=y CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 @@ -16,8 +16,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/w530-maximized/bzImage" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_LINUX_INITRD="../../build/w530-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-x220-hotp-maximized.config b/config/coreboot-x220-hotp-maximized.config index 63f48927..2af653e7 100644 --- a/config/coreboot-x220-hotp-maximized.config +++ b/config/coreboot-x220-hotp-maximized.config @@ -2,9 +2,9 @@ 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_X220=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/x220-hotp-maximized/bzImage" -CONFIG_LINUX_INITRD="../../build/x220-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-x220-maximized.config b/config/coreboot-x220-maximized.config index b47974ed..2af653e7 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -2,9 +2,9 @@ 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_X220=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/x220-maximized/bzImage" -CONFIG_LINUX_INITRD="../../build/x220-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-x220.config b/config/coreboot-x220.config index c83e001b..2af653e7 100644 --- a/config/coreboot-x220.config +++ b/config/coreboot-x220.config @@ -2,9 +2,9 @@ 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_X220=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/x220/bzImage" -CONFIG_LINUX_INITRD="../../build/x220/initrd.cpio.xz" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" +CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-x230-flash.config b/config/coreboot-x230-flash.config index 1bcc80df..d018f48e 100644 --- a/config/coreboot-x230-flash.config +++ b/config/coreboot-x230-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/x230-flash/bzImage" -CONFIG_LINUX_INITRD="../../build/x230-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-x230-hotp-maximized.config b/config/coreboot-x230-hotp-maximized.config index e5f0e436..80724c9a 100644 --- a/config/coreboot-x230-hotp-maximized.config +++ b/config/coreboot-x230-hotp-maximized.config @@ -2,9 +2,9 @@ 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_X230=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/x230-hotp-maximized/bzImage" -CONFIG_LINUX_INITRD="../../build/x230-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-x230-hotp-maximized_usb-kb.config b/config/coreboot-x230-hotp-maximized_usb-kb.config index 782665d6..80724c9a 100644 --- a/config/coreboot-x230-hotp-maximized_usb-kb.config +++ b/config/coreboot-x230-hotp-maximized_usb-kb.config @@ -2,9 +2,9 @@ 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_X230=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/x230-hotp-maximized_usb-kb/bzImage" -CONFIG_LINUX_INITRD="../../build/x230-hotp-maximized_usb-kb/initrd.cpio.xz" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" +CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-x230-hotp-verification.config b/config/coreboot-x230-hotp-verification.config index ec93cf1b..f7bc16dd 100644 --- a/config/coreboot-x230-hotp-verification.config +++ b/config/coreboot-x230-hotp-verification.config @@ -10,5 +10,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/x230-hotp-verification/bzImage" -CONFIG_LINUX_INITRD="../../build/x230-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-x230-maximized.config b/config/coreboot-x230-maximized.config index 9fad47aa..80724c9a 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -2,9 +2,9 @@ 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_X230=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/x230-maximized/bzImage" -CONFIG_LINUX_INITRD="../../build/x230-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-x230.config b/config/coreboot-x230.config index 9f8b40c5..f7bc16dd 100644 --- a/config/coreboot-x230.config +++ b/config/coreboot-x230.config @@ -10,5 +10,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/x230/bzImage" -CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz" +CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" +CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config index a2bdd463..89a7020a 100644 --- a/config/linux-kgpe-d16_server-whiptail.config +++ b/config/linux-kgpe-d16_server-whiptail.config @@ -7,7 +7,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config index a2bdd463..89a7020a 100644 --- a/config/linux-kgpe-d16_server.config +++ b/config/linux-kgpe-d16_server.config @@ -7,7 +7,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index e989e556..ff30451d 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -7,7 +7,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-librem_common.config b/config/linux-librem_common.config index 4a616732..cba7be1f 100644 --- a/config/linux-librem_common.config +++ b/config/linux-librem_common.config @@ -7,7 +7,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-linuxboot.config b/config/linux-linuxboot.config index ceeddf53..a6e05240 100644 --- a/config/linux-linuxboot.config +++ b/config/linux-linuxboot.config @@ -20,7 +20,7 @@ CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-qemu.config b/config/linux-qemu.config index 6bb7a09a..b7613802 100644 --- a/config/linux-qemu.config +++ b/config/linux-qemu.config @@ -163,7 +163,7 @@ CONFIG_CGROUP_DEBUG=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_GZIP is not set diff --git a/config/linux-x230-flash.config b/config/linux-x230-flash.config index b91cc7af..7afa9093 100644 --- a/config/linux-x230-flash.config +++ b/config/linux-x230-flash.config @@ -7,7 +7,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ_IDLE=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-x230-legacy.config b/config/linux-x230-legacy.config index 73bbab15..95666b8c 100644 --- a/config/linux-x230-legacy.config +++ b/config/linux-x230-legacy.config @@ -7,7 +7,7 @@ CONFIG_KERNEL_XZ=y CONFIG_NO_HZ_IDLE=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/config/linux-x230-maximized.config b/config/linux-x230-maximized.config index 96d5dc19..c886b969 100644 --- a/config/linux-x230-maximized.config +++ b/config/linux-x230-maximized.config @@ -7,7 +7,7 @@ CONFIG_KERNEL_XZ=y CONFIG_NO_HZ_IDLE=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set diff --git a/modules/coreboot b/modules/coreboot index faf88cdd..af1ba826 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -47,7 +47,7 @@ EXTRA_FLAGS ?= -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-err coreboot_configure := \ mkdir -p "$(build)/$(coreboot_dir)" \ - && cp "$(pwd)/$(CONFIG_COREBOOT_CONFIG)" "$(build)/$(coreboot_dir)/.config" \ + && $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config) \ && echo 'CONFIG_LOCALVERSION="Heads-$(HEADS_GIT_VERSION)"' >> $(build)/$(coreboot_dir)/.config \ && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(BOARD)"' >> $(build)/$(coreboot_dir)/.config \ && $(MAKE) olddefconfig \ diff --git a/modules/linux b/modules/linux index 2162a7c3..6a3a84a2 100644 --- a/modules/linux +++ b/modules/linux @@ -41,7 +41,7 @@ $(build)/$(linux_dir)/.configured: $(linux_kconfig) linux_configure := \ mkdir -p "$(build)/$(linux_dir)" \ - && cp "$(pwd)/$(linux_kconfig)" "$(build)/$(linux_dir)/.config" \ + && $(call install_config,$(pwd)/$(linux_kconfig),$(build)/$(linux_dir)/.config) \ && $(MAKE) -C .. \ CROSS_COMPILE="$(CROSS)" \ O="$(build)/$(linux_dir)" \