Merge pull request #1301 from tlaurion/reduce_coreboot_configuration_…

…duplicates-label_legacy_boards_correctly xx20/xx30: Reduce coreboot configuration duplicates + label legacy boards correctly
linuxboot · Feb 15, 2023 · ffd8ab9 · ffd8ab9
2 parents 5b6370c + 0112763
commit ffd8ab9
Show file tree

Hide file tree

Showing 34 changed files with 33 additions and 296 deletions.
diff --git 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

diff --git 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/...erification/t430-hotp-verification.config → .../t430-hotp-legacy/t430-hotp-legacy.config b/...erification/t430-hotp-verification.config → .../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-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/t430-flash/t430-flash.config → ...430-legacy-flash/t430-legacy-flash.config b/boards/t430-flash/t430-flash.config → ...430-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 → boards/t430-legacy/t430-legacy.config b/boards/t430/t430.config → 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...erification/x230-hotp-verification.config → .../x230-hotp-legacy/x230-hotp-legacy.config b/...erification/x230-hotp-verification.config → .../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/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/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 → ...230-legacy-flash/x230-legacy-flash.config b/boards/x230-flash/x230-flash.config → ...230-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 → boards/x230-legacy/x230-legacy.config b/boards/x230/x230.config → 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-t420-hotp-maximized.config b/config/coreboot-t420-hotp-maximized.config
diff --git a/config/coreboot-t430-hotp-maximized.config b/config/coreboot-t430-hotp-maximized.config
diff --git a/config/coreboot-t430-hotp-verification.config b/config/coreboot-t430-hotp-verification.config
diff --git a/config/coreboot-t430-flash.config → config/coreboot-t430-legacy-flash.config b/config/coreboot-t430-flash.config → config/coreboot-t430-legacy-flash.config
diff --git a/config/coreboot-t430.config → config/coreboot-t430-legacy.config b/config/coreboot-t430.config → config/coreboot-t430-legacy.config
diff --git a/config/coreboot-t520-hotp-maximized.config b/config/coreboot-t520-hotp-maximized.config
diff --git a/config/coreboot-t530-hotp-maximized.config b/config/coreboot-t530-hotp-maximized.config
diff --git a/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config b/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config