From 225741b4cd834d5d451351a7a86bb1db7d0fb8c7 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 31 Jan 2023 10:49:16 -0500 Subject: [PATCH 1/3] remove coreboot-hotp* duplicates, have boards configs point to non-hotp maximized equivalents --- .../t420-hotp-maximized.config | 2 +- .../t430-hotp-maximized.config | 2 +- .../t520-hotp-maximized.config | 2 +- .../t530-dgpu-hotp-maximized.config | 2 +- .../t530-hotp-maximized.config | 2 +- .../w530-dgpu-K1000m-hotp-maximized.config | 2 +- .../w530-dgpu-K2000m-hotp-maximized.config | 2 +- .../w530-hotp-maximized.config | 2 +- .../x220-hotp-maximized.config | 2 +- .../x230-hotp-maximized.config | 2 +- config/coreboot-t420-hotp-maximized.config | 22 -------------- config/coreboot-t430-hotp-maximized.config | 22 -------------- config/coreboot-t520-hotp-maximized.config | 23 -------------- config/coreboot-t530-hotp-maximized.config | 23 -------------- ...oot-w530-dgpu-K1000m-hotp-maximized.config | 30 ------------------- ...oot-w530-dgpu-K2000m-hotp-maximized.config | 30 ------------------- config/coreboot-w530-hotp-maximized.config | 23 -------------- config/coreboot-x220-hotp-maximized.config | 20 ------------- config/coreboot-x230-hotp-maximized.config | 20 ------------- ...coreboot-x230-hotp-maximized_usb-kb.config | 20 ------------- 20 files changed, 10 insertions(+), 243 deletions(-) delete mode 100644 config/coreboot-t420-hotp-maximized.config delete mode 100644 config/coreboot-t430-hotp-maximized.config delete mode 100644 config/coreboot-t520-hotp-maximized.config delete mode 100644 config/coreboot-t530-hotp-maximized.config delete mode 100644 config/coreboot-w530-dgpu-K1000m-hotp-maximized.config delete mode 100644 config/coreboot-w530-dgpu-K2000m-hotp-maximized.config delete mode 100644 config/coreboot-w530-hotp-maximized.config delete mode 100644 config/coreboot-x220-hotp-maximized.config delete mode 100644 config/coreboot-x230-hotp-maximized.config delete mode 100644 config/coreboot-x230-hotp-maximized_usb-kb.config diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config index 7b0d90088..0491b8db8 100644 --- a/boards/t420-hotp-maximized/t420-hotp-maximized.config +++ b/boards/t420-hotp-maximized/t420-hotp-maximized.config @@ -12,7 +12,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t420-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config index 6335004aa..372d12128 100644 --- a/boards/t430-hotp-maximized/t430-hotp-maximized.config +++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config @@ -10,7 +10,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t430-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/t520-hotp-maximized/t520-hotp-maximized.config b/boards/t520-hotp-maximized/t520-hotp-maximized.config index bfc7c2a33..2d0fc92f7 100644 --- a/boards/t520-hotp-maximized/t520-hotp-maximized.config +++ b/boards/t520-hotp-maximized/t520-hotp-maximized.config @@ -8,7 +8,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t520-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config b/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config index a656c3b6d..00f2c0393 100644 --- a/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config +++ b/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/t530-hotp-maximized/t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config index c73e8ef09..b53d9c513 100644 --- a/boards/t530-hotp-maximized/t530-hotp-maximized.config +++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t530-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config b/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config index f1754b8b5..b73bc426b 100644 --- a/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config +++ b/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-w530-dgpu-K1000m-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-w530-dgpu-K1000m-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config b/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config index 88531176f..7660b76fc 100644 --- a/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config +++ b/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-w530-dgpu-K2000m-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-w530-dgpu-K2000m-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/w530-hotp-maximized/w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config index 8d7ffabe3..7cbb1fc9b 100644 --- a/boards/w530-hotp-maximized/w530-hotp-maximized.config +++ b/boards/w530-hotp-maximized/w530-hotp-maximized.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-w530-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-w530-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config index fa90993e8..54c38f068 100644 --- a/boards/x220-hotp-maximized/x220-hotp-maximized.config +++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config @@ -12,7 +12,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-x220-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index a7226da29..85dd1ee44 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -10,7 +10,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-x230-hotp-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/config/coreboot-t420-hotp-maximized.config b/config/coreboot-t420-hotp-maximized.config deleted file mode 100644 index 455aa803e..000000000 --- a/config/coreboot-t420-hotp-maximized.config +++ /dev/null @@ -1,22 +0,0 @@ -# CONFIG_USE_BLOBS is not set -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0x7E7FFF -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" -CONFIG_UART_PCI_ADDR=0 -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -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 deleted file mode 100644 index e46c9c702..000000000 --- a/config/coreboot-t430-hotp-maximized.config +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0xBE4FFF -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" -CONFIG_UART_PCI_ADDR=0 -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-t520-hotp-maximized.config b/config/coreboot-t520-hotp-maximized.config deleted file mode 100644 index 0665a3958..000000000 --- a/config/coreboot-t520-hotp-maximized.config +++ /dev/null @@ -1,23 +0,0 @@ -# CONFIG_INCLUDE_CONFIG_FILE is not set -# CONFIG_COLLECT_TIMESTAMPS is not set -CONFIG_USE_BLOBS=y -CONFIG_MEASURED_BOOT=y -CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0x7E7FFF -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="@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="@BLOB_DIR@/xx20/gbe.bin" -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" -CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y diff --git a/config/coreboot-t530-hotp-maximized.config b/config/coreboot-t530-hotp-maximized.config deleted file mode 100644 index cac333e60..000000000 --- a/config/coreboot-t530-hotp-maximized.config +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0xBE4FFF -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -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 -# CONFIG_CONSOLE_SERIAL is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -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 deleted file mode 100644 index 64a2f3ecd..000000000 --- a/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config +++ /dev/null @@ -1,30 +0,0 @@ -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0xBE4FFF -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -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="@BLOB_DIR@/xx30/10de,0ffc.rom" -CONFIG_VGA_BIOS=y -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 -CONFIG_BOARD_LENOVO_W530=y -CONFIG_NO_POST=y -CONFIG_UART_PCI_ADDR=0 -# CONFIG_CONSOLE_SERIAL is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -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 deleted file mode 100644 index ab1ea461f..000000000 --- a/config/coreboot-w530-dgpu-K2000m-hotp-maximized.config +++ /dev/null @@ -1,30 +0,0 @@ -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0xBE4FFF -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -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="@BLOB_DIR@/xx30/10de,0ffb.rom" -CONFIG_VGA_BIOS=y -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 -CONFIG_BOARD_LENOVO_W530=y -CONFIG_NO_POST=y -CONFIG_UART_PCI_ADDR=0 -# CONFIG_CONSOLE_SERIAL is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -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 deleted file mode 100644 index daf91635b..000000000 --- a/config/coreboot-w530-hotp-maximized.config +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0xBE4FFF -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -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 -# CONFIG_CONSOLE_SERIAL is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -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 deleted file mode 100644 index 934ff13f7..000000000 --- a/config/coreboot-x220-hotp-maximized.config +++ /dev/null @@ -1,20 +0,0 @@ -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0x7E7FFF -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" -CONFIG_UART_PCI_ADDR=0 -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -CONFIG_NO_GFX_INIT=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -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 deleted file mode 100644 index dedeed36a..000000000 --- a/config/coreboot-x230-hotp-maximized.config +++ /dev/null @@ -1,20 +0,0 @@ -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0xBE4FFF -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" -CONFIG_UART_PCI_ADDR=0 -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -CONFIG_NO_GFX_INIT=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -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 deleted file mode 100644 index dedeed36a..000000000 --- a/config/coreboot-x230-hotp-maximized_usb-kb.config +++ /dev/null @@ -1,20 +0,0 @@ -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0xBE4FFF -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" -CONFIG_UART_PCI_ADDR=0 -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y -CONFIG_NO_GFX_INIT=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" From 03631a5e33945f07ff46cffc9f75b62257a0bf3c Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 31 Jan 2023 11:46:32 -0500 Subject: [PATCH 2/3] xx30: rename legacy boards names, remove coreboot config duplicates --- .circleci/config.yml | 14 -------------- .../t430-hotp-legacy.config} | 4 ++-- .../t430-legacy-flash.config} | 2 +- .../t430-legacy.config} | 4 ++-- .../x230-hotp-legacy.config} | 4 ++-- .../x230-hotp-maximized_usb-kb.config | 2 +- .../x230-legacy-flash.config} | 2 +- .../x230-legacy.config} | 4 ++-- config/coreboot-t430-hotp-verification.config | 16 ---------------- ....config => coreboot-t430-legacy-flash.config} | 0 ...t-t430.config => coreboot-t430-legacy.config} | 0 ....config => coreboot-x230-legacy-flash.config} | 0 ...cation.config => coreboot-x230-legacy.config} | 0 config/coreboot-x230.config | 14 -------------- 14 files changed, 11 insertions(+), 55 deletions(-) rename boards/{t430-hotp-verification/t430-hotp-verification.config => t430-hotp-legacy/t430-hotp-legacy.config} (94%) rename boards/{t430-flash/t430-flash.config => t430-legacy-flash/t430-legacy-flash.config} (96%) rename boards/{t430/t430.config => t430-legacy/t430-legacy.config} (94%) rename boards/{x230-hotp-verification/x230-hotp-verification.config => x230-hotp-legacy/x230-hotp-legacy.config} (94%) rename boards/{x230-flash/x230-flash.config => x230-legacy-flash/x230-legacy-flash.config} (96%) rename boards/{x230/x230.config => x230-legacy/x230-legacy.config} (94%) delete mode 100644 config/coreboot-t430-hotp-verification.config rename config/{coreboot-t430-flash.config => coreboot-t430-legacy-flash.config} (100%) rename config/{coreboot-t430.config => coreboot-t430-legacy.config} (100%) rename config/{coreboot-x230-flash.config => coreboot-x230-legacy-flash.config} (100%) rename config/{coreboot-x230-hotp-verification.config => coreboot-x230-legacy.config} (100%) delete mode 100644 config/coreboot-x230.config diff --git a/.circleci/config.yml b/.circleci/config.yml index 04e7c29aa..b742a7369 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -352,20 +352,6 @@ workflows: requires: - x230-hotp-maximized - - build: - name: x230-maximized-fhd_edp - target: x230-maximized-fhd_edp - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-hotp-maximized-fhd_edp - target: x230-hotp-maximized-fhd_edp - subcommand: "" - requires: - - x230-hotp-maximized - - build: name: t530-hotp-maximized target: t530-hotp-maximized diff --git a/boards/t430-hotp-verification/t430-hotp-verification.config b/boards/t430-hotp-legacy/t430-hotp-legacy.config similarity index 94% rename from boards/t430-hotp-verification/t430-hotp-verification.config rename to boards/t430-hotp-legacy/t430-hotp-legacy.config index 2fad46543..f572ad71d 100644 --- a/boards/t430-hotp-verification/t430-hotp-verification.config +++ b/boards/t430-hotp-legacy/t430-hotp-legacy.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t430-hotp-verification.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy.config CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config #Additional hardware support @@ -61,7 +61,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOOT_KERNEL_REMOVE="quiet" export CONFIG_BOOT_DEV="/dev/sda1" -export CONFIG_BOARD_NAME="Thinkpad T430-hotp" +export CONFIG_BOARD_NAME="Thinkpad T430-hotp-legacy" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board has two SPI flash chips, an 8 MB that holds the IFD, diff --git a/boards/t430-flash/t430-flash.config b/boards/t430-legacy-flash/t430-legacy-flash.config similarity index 96% rename from boards/t430-flash/t430-flash.config rename to boards/t430-legacy-flash/t430-legacy-flash.config index bfe513333..8b06966d8 100644 --- a/boards/t430-flash/t430-flash.config +++ b/boards/t430-legacy-flash/t430-legacy-flash.config @@ -18,7 +18,7 @@ CONFIG_LINUX_USB=y #CONFIG_LINUX_E1000E=y export CONFIG_BOOTSCRIPT=/bin/t430-flash.init -export CONFIG_BOARD_NAME="ThinkPad T430-flash" +export CONFIG_BOARD_NAME="ThinkPad T430-legacy-flash" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board is "special" in that we need a 4MB top SPI flashable ROM. diff --git a/boards/t430/t430.config b/boards/t430-legacy/t430-legacy.config similarity index 94% rename from boards/t430/t430.config rename to boards/t430-legacy/t430-legacy.config index ee7bd3ea8..8c2666d0b 100644 --- a/boards/t430/t430.config +++ b/boards/t430-legacy/t430-legacy.config @@ -8,7 +8,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-t430.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy.config CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config #Additional hardware support @@ -56,7 +56,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOOT_KERNEL_REMOVE="quiet" export CONFIG_BOOT_DEV="/dev/sda1" -export CONFIG_BOARD_NAME="Thinkpad T430" +export CONFIG_BOARD_NAME="Thinkpad T430-legacy" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board has two SPI flash chips, an 8 MB that holds the IFD, diff --git a/boards/x230-hotp-verification/x230-hotp-verification.config b/boards/x230-hotp-legacy/x230-hotp-legacy.config similarity index 94% rename from boards/x230-hotp-verification/x230-hotp-verification.config rename to boards/x230-hotp-legacy/x230-hotp-legacy.config index bbad3d6e1..ceedc16e0 100644 --- a/boards/x230-hotp-verification/x230-hotp-verification.config +++ b/boards/x230-hotp-legacy/x230-hotp-legacy.config @@ -11,7 +11,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-x230-hotp-verification.config +CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy.config CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config #Additional hardware support @@ -61,7 +61,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOOT_KERNEL_REMOVE="quiet" export CONFIG_BOOT_DEV="/dev/sda1" -export CONFIG_BOARD_NAME="Thinkpad X230-hotp" +export CONFIG_BOARD_NAME="Thinkpad X230-hotp-legacy" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board has two SPI flash chips, an 8 MB that holds the IFD, diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config index feffc9d67..db5e745af 100644 --- a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config +++ b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config @@ -12,7 +12,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-x230-hotp-maximized_usb-kb.config +CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config #Additional hardware support diff --git a/boards/x230-flash/x230-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config similarity index 96% rename from boards/x230-flash/x230-flash.config rename to boards/x230-legacy-flash/x230-legacy-flash.config index 2497a920a..31f1d8985 100644 --- a/boards/x230-flash/x230-flash.config +++ b/boards/x230-legacy-flash/x230-legacy-flash.config @@ -18,7 +18,7 @@ CONFIG_LINUX_USB=y #CONFIG_LINUX_E1000E=y export CONFIG_BOOTSCRIPT=/bin/x230-flash.init -export CONFIG_BOARD_NAME="ThinkPad X230-flash" +export CONFIG_BOARD_NAME="ThinkPad X230-legacy-flash" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board is "special" in that we need a 4MB top SPI flashable ROM. diff --git a/boards/x230/x230.config b/boards/x230-legacy/x230-legacy.config similarity index 94% rename from boards/x230/x230.config rename to boards/x230-legacy/x230-legacy.config index b9f5d26b3..bf5e1d761 100644 --- a/boards/x230/x230.config +++ b/boards/x230-legacy/x230-legacy.config @@ -7,7 +7,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 -CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config +CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy.config CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config #Additional hardware support @@ -55,7 +55,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOOT_KERNEL_REMOVE="quiet" export CONFIG_BOOT_DEV="/dev/sda1" -export CONFIG_BOARD_NAME="Thinkpad X230" +export CONFIG_BOARD_NAME="Thinkpad X230-legacy" export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" # This board has two SPI flash chips, an 8 MB that holds the IFD, diff --git a/config/coreboot-t430-hotp-verification.config b/config/coreboot-t430-hotp-verification.config deleted file mode 100644 index 74064083a..000000000 --- a/config/coreboot-t430-hotp-verification.config +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0x700000 -CONFIG_BOARD_LENOVO_THINKPAD_T430=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_UART_PCI_ADDR=0 -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -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-legacy-flash.config similarity index 100% rename from config/coreboot-t430-flash.config rename to config/coreboot-t430-legacy-flash.config diff --git a/config/coreboot-t430.config b/config/coreboot-t430-legacy.config similarity index 100% rename from config/coreboot-t430.config rename to config/coreboot-t430-legacy.config diff --git a/config/coreboot-x230-flash.config b/config/coreboot-x230-legacy-flash.config similarity index 100% rename from config/coreboot-x230-flash.config rename to config/coreboot-x230-legacy-flash.config diff --git a/config/coreboot-x230-hotp-verification.config b/config/coreboot-x230-legacy.config similarity index 100% rename from config/coreboot-x230-hotp-verification.config rename to config/coreboot-x230-legacy.config diff --git a/config/coreboot-x230.config b/config/coreboot-x230.config deleted file mode 100644 index f7bc16dd8..000000000 --- a/config/coreboot-x230.config +++ /dev/null @@ -1,14 +0,0 @@ -# CONFIG_USE_BLOBS is not set -CONFIG_VENDOR_LENOVO=y -CONFIG_NO_POST=y -CONFIG_CBFS_SIZE=0x700000 -CONFIG_BOARD_LENOVO_X230=y -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" -CONFIG_UART_PCI_ADDR=0 -CONFIG_NO_GFX_INIT=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" From 011276350b567935011555bf373dd5c7dd201784 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 31 Jan 2023 11:48:22 -0500 Subject: [PATCH 3/3] CircleCI: change board names to reflect board name changes (legacy tagged correctly) --- .circleci/config.yml | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b742a7369..972c642a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -290,43 +290,43 @@ workflows: - x230-hotp-maximized - build: - name: x230-flash - target: x230-flash + name: x230-legacy-flash + target: x230-legacy-flash subcommand: "" requires: - x230-hotp-maximized - build: - name: t430-flash - target: t430-flash + name: t430-legacy-flash + target: t430-legacy-flash subcommand: "" requires: - x230-hotp-maximized - build: - name: t430 - target: t430 + name: t430-legacy + target: t430-legacy subcommand: "" requires: - x230-hotp-maximized - build: - name: t430-hotp-verification - target: t430-hotp-verification + name: t430-hotp-legacy + target: t430-hotp-legacy subcommand: "" requires: - x230-hotp-maximized - build: - name: x230 - target: x230 + name: x230-legacy + target: x230-legacy subcommand: "" requires: - x230-hotp-maximized - build: - name: x230-hotp-verification - target: x230-hotp-verification + name: x230-hotp-legacy + target: x230-hotp-legacy subcommand: "" requires: - x230-hotp-maximized @@ -352,6 +352,20 @@ workflows: requires: - x230-hotp-maximized + - build: + name: x230-maximized-fhd_edp + target: x230-maximized-fhd_edp + subcommand: "" + requires: + - x230-hotp-maximized + + - build: + name: x230-hotp-maximized-fhd_edp + target: x230-hotp-maximized-fhd_edp + subcommand: "" + requires: + - x230-hotp-maximized + - build: name: t530-hotp-maximized target: t530-hotp-maximized