Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xx20/xx30: Reduce coreboot configuration duplicates + label legacy boards correctly #1301

Merged
merged 3 commits into from
Feb 15, 2023
Merged

xx20/xx30: Reduce coreboot configuration duplicates + label legacy boards correctly #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
225741b
remove coreboot-hotp* duplicates, have boards configs point to non-ho…
tlaurion Jan 31, 2023
03631a5
xx30: rename legacy boards names, remove coreboot config duplicates
tlaurion Jan 31, 2023
0112763
CircleCI: change board names to reflect board name changes (legacy ta…
tlaurion Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/t420-hotp-maximized/t420-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...erification/t430-hotp-verification.config → .../t430-hotp-legacy/t430-hotp-legacy.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion boards/t430-hotp-maximized/t430-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/t430-flash/t430-flash.config → ...430-legacy-flash/t430-legacy-flash.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions boards/t430/t430.config → boards/t430-legacy/t430-legacy.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion boards/t520-hotp-maximized/t520-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-hotp-maximized/t530-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-hotp-maximized/w530-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/x220-hotp-maximized/x220-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...erification/x230-hotp-verification.config → .../x230-hotp-legacy/x230-hotp-legacy.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion boards/x230-hotp-maximized/x230-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/x230-flash/x230-flash.config → ...230-legacy-flash/x230-legacy-flash.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions boards/x230/x230.config → boards/x230-legacy/x230-legacy.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
22 changes: 0 additions & 22 deletions config/coreboot-t420-hotp-maximized.config
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions config/coreboot-t430-hotp-maximized.config
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions config/coreboot-t430-hotp-verification.config
View file
Open in desktop

This file was deleted.

0 config/coreboot-t430-flash.config → config/coreboot-t430-legacy-flash.config
View file
Open in desktop
File renamed without changes.
0 config/coreboot-t430.config → config/coreboot-t430-legacy.config
View file
Open in desktop
File renamed without changes.
23 changes: 0 additions & 23 deletions config/coreboot-t520-hotp-maximized.config
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions config/coreboot-t530-hotp-maximized.config
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions config/coreboot-w530-dgpu-K1000m-hotp-maximized.config
View file
Open in desktop

This file was deleted.

Loading