From 415a08a73259840e753fb1a4ca6cc3e99ed4b339 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 5 Dec 2021 13:24:50 -0500 Subject: [PATCH] board additions: w530, t530, t520 (hotp-maximized and maximized flavors only) -CircleCI addition. -Removal of t530-flash, w530-flash boards, flash scripts and associated coreboot configs (no more legacy boards additions) This is a merger of #1071, #1072 and #1073 so that test builds are available over CircleCI until osresearch/master CircleCI gets unlocked. --- .circleci/config.yml | 42 +++++++++++++++++++++++++++++ boards/t530-flash/t530-flash.config | 33 ----------------------- boards/w530-flash/w530-flash.config | 33 ----------------------- config/coreboot-t530-flash.config | 16 ----------- config/coreboot-w530-flash.config | 16 ----------- initrd/bin/t530-flash.init | 26 ------------------ initrd/bin/w530-flash.init | 26 ------------------ 7 files changed, 42 insertions(+), 150 deletions(-) delete mode 100644 boards/t530-flash/t530-flash.config delete mode 100644 boards/w530-flash/w530-flash.config delete mode 100644 config/coreboot-t530-flash.config delete mode 100644 config/coreboot-w530-flash.config delete mode 100755 initrd/bin/t530-flash.init delete mode 100755 initrd/bin/w530-flash.init diff --git a/.circleci/config.yml b/.circleci/config.yml index f86264a5..3e1b16d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,6 +231,13 @@ workflows: requires: - x230-hotp-maximized + - build: + name: t520-hotp-maximized + target: t520-hotp-maximized + subcommand: "" + requires: + - x230-hotp-maximized + - build: name: t420-maximized target: t420-maximized @@ -238,6 +245,13 @@ workflows: requires: - x230-hotp-maximized + - build: + name: t520-maximized + target: t520-maximized + subcommand: "" + requires: + - x230-hotp-maximized + - build: name: x230-flash target: x230-flash @@ -287,6 +301,20 @@ workflows: requires: - x230-hotp-maximized + - build: + name: t530-hotp-maximized + target: t530-hotp-maximized + subcommand: "" + requires: + - x230-hotp-maximized + + - build: + name: w530-hotp-maximized + target: w530-hotp-maximized + subcommand: "" + requires: + - x230-hotp-maximized + - build: name: t430-maximized target: t430-maximized @@ -294,6 +322,20 @@ workflows: requires: - x230-hotp-maximized + - build: + name: t530-maximized + target: t530-maximized + subcommand: "" + requires: + - x230-hotp-maximized + + - build: + name: w530-maximized + target: w530-maximized + subcommand: "" + requires: + - x230-hotp-maximized + - build: name: qemu-coreboot target: qemu-coreboot diff --git a/boards/t530-flash/t530-flash.config b/boards/t530-flash/t530-flash.config deleted file mode 100644 index 5a8c80ab..00000000 --- a/boards/t530-flash/t530-flash.config +++ /dev/null @@ -1,33 +0,0 @@ -# Minimal configuration for a t530 to support flashrom, USB and networking -BOARD=t530.flash - -export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.13 -export CONFIG_LINUX_VERSION=4.14.62 - -CONFIG_FLASHROM=y -#CONFIG_GPG=y -CONFIG_FLASHTOOLS=y -CONFIG_PCIUTILS=y -#CONFIG_MBEDTLS=y -#CONFIG_QRENCODE=y -#CONFIG_TPMTOTP=y -#CONFIG_DROPBEAR=y - -CONFIG_LINUX_CONFIG=config/linux-x230-flash.config -CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y - -export CONFIG_BOOTSCRIPT=/bin/t530-flash.init -export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" - -# This board is "special" in that we only want the top 4 MB of the ROM -# for flashing into SPI flash 1 on the mainboard. This is enough to -# allow the board to boot into a minimal Heads and read the full -# ROM from an external USB media. -all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom -$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE) - $(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none) - @sha256sum $@ - #We remove the original ROM, leaving only the 4mb top one - rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE) diff --git a/boards/w530-flash/w530-flash.config b/boards/w530-flash/w530-flash.config deleted file mode 100644 index 1d28176c..00000000 --- a/boards/w530-flash/w530-flash.config +++ /dev/null @@ -1,33 +0,0 @@ -# Minimal configuration for a w530 to support flashrom, USB and networking -BOARD=w530.flash - -export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.13 -export CONFIG_LINUX_VERSION=4.14.62 - -CONFIG_FLASHROM=y -#CONFIG_GPG=y -CONFIG_FLASHTOOLS=y -CONFIG_PCIUTILS=y -#CONFIG_MBEDTLS=y -#CONFIG_QRENCODE=y -#CONFIG_TPMTOTP=y -#CONFIG_DROPBEAR=y - -CONFIG_LINUX_CONFIG=config/linux-x230-flash.config -CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y - -export CONFIG_BOOTSCRIPT=/bin/w530-flash.init -export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios" - -# This board is "special" in that we only want the top 4 MB of the ROM -# for flashing into SPI flash 1 on the mainboard. This is enough to -# allow the board to boot into a minimal Heads and read the full -# ROM from an external USB media. -all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom -$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE) - $(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none) - @sha256sum $@ - #We remove the original ROM, leaving only the 4mb top one - rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE) diff --git a/config/coreboot-t530-flash.config b/config/coreboot-t530-flash.config deleted file mode 100644 index 8ed798d9..00000000 --- a/config/coreboot-t530-flash.config +++ /dev/null @@ -1,16 +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=0x400000 -# CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y -CONFIG_BOARD_LENOVO_T530=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_UART_PCI_ADDR=0 -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/t530-flash/bzImage" -CONFIG_LINUX_INITRD="../../build/t530-flash/initrd.cpio.xz" diff --git a/config/coreboot-w530-flash.config b/config/coreboot-w530-flash.config deleted file mode 100644 index cfd15f75..00000000 --- a/config/coreboot-w530-flash.config +++ /dev/null @@ -1,16 +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=0x400000 -# CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y -CONFIG_BOARD_LENOVO_W530=y -CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_UART_PCI_ADDR=0 -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y -CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/w530-flash/bzImage" -CONFIG_LINUX_INITRD="../../build/w530-flash/initrd.cpio.xz" diff --git a/initrd/bin/t530-flash.init b/initrd/bin/t530-flash.init deleted file mode 100755 index 0403e64b..00000000 --- a/initrd/bin/t530-flash.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Initialize the USB and network device drivers, -# invoke a recovery shell and prompt the user for how to proceed - -. /etc/functions -. /tmp/config - -insmod /lib/modules/ehci-hcd.ko -insmod /lib/modules/ehci-pci.ko -insmod /lib/modules/xhci-hcd.ko -insmod /lib/modules/xhci-pci.ko -insmod /lib/modules/e1000e.ko -insmod /lib/modules/usb-storage.ko - -tpm extend -ix 4 -ic recovery -sleep 2 - -echo '***** Starting recovery shell' -echo '' -echo 'To install from flash drive:' -echo '' -echo ' mount -o ro /dev/sdb1 /media' -echo ' flash.sh /media/t530.rom' -echo '' - -exec /bin/ash diff --git a/initrd/bin/w530-flash.init b/initrd/bin/w530-flash.init deleted file mode 100755 index 9f84af0c..00000000 --- a/initrd/bin/w530-flash.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Initialize the USB and network device drivers, -# invoke a recovery shell and prompt the user for how to proceed - -. /etc/functions -. /tmp/config - -insmod /lib/modules/ehci-hcd.ko -insmod /lib/modules/ehci-pci.ko -insmod /lib/modules/xhci-hcd.ko -insmod /lib/modules/xhci-pci.ko -insmod /lib/modules/e1000e.ko -insmod /lib/modules/usb-storage.ko - -tpm extend -ix 4 -ic recovery -sleep 2 - -echo '***** Starting recovery shell' -echo '' -echo 'To install from flash drive:' -echo '' -echo ' mount -o ro /dev/sdb1 /media' -echo ' flash.sh /media/w530.rom' -echo '' - -exec /bin/ash