xx30: rename legacy boards names, remove coreboot config duplicates

.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

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,

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.

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,

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,

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

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.

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,

config/coreboot-t430-hotp-verification.config

@@ -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"

config/coreboot-x230.config

@@ -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"