From bb120b14ae2ad0b4246b8153c7f18022d63ab550 Mon Sep 17 00:00:00 2001 From: gaspar-ilom Date: Fri, 7 Mar 2025 17:28:43 +0100 Subject: [PATCH] Revert "t480: move to unmaintained, remove t480 from circleci. Upstream will need to fix thermal codepath: as of now its either other thinkpads or t480. Not good" With 3466272a69f1345340f5eeda05a5dd338883f8eb T480 thermal codepath does not break other boards anymore. We move it back to circleci and maintained. This reverts commit 730fdd1b25384bacc8e491c543709f5967651ffb. Signed-off-by: gaspar-ilom --- .circleci/config.yml | 64 +++++++++---------- .../t480-hotp-maximized.config | 0 .../t480-maximized/t480-maximized.config | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) rename unmaintained_boards/UNMAINTAINED_t480-hotp-maximized/UNMAINTAINED_t480-hotp-maximized.config => boards/t480-hotp-maximized/t480-hotp-maximized.config (100%) rename unmaintained_boards/UNMAINTAINED_t480-maximized/UNMAINTAINED_t480-maximized.config => boards/t480-maximized/t480-maximized.config (97%) diff --git a/.circleci/config.yml b/.circleci/config.yml index a95a16b9..a3cf6c99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -250,10 +250,10 @@ workflows: requires: - novacustom-nv4x_adl - # x230 is based on 24.12 coreboot release here + # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache - build_and_persist: - name: x230-hotp-maximized - target: x230-hotp-maximized + name: t480-hotp-maximized + target: t480-hotp-maximized subcommand: "" requires: - x86-musl-cross-make @@ -280,7 +280,7 @@ workflows: - save_cache: requires: - UNTESTED_talos-2 - - x230-hotp-maximized + - t480-hotp-maximized # Those onboarding new boards should add their entries below. # coreboot 24.12 boards @@ -289,49 +289,49 @@ workflows: target: x220-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: x220-maximized target: x220-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t420-hotp-maximized target: t420-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t420-maximized target: t420-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: x230-hotp-maximized_usb-kb target: x230-hotp-maximized_usb-kb subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t430-hotp-maximized target: t430-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: x230-maximized target: x230-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized #TODO: move away of 24.02.01 coreboot and depend on optiplex specific dasharo commit - build: @@ -339,126 +339,126 @@ workflows: target: optiplex-7010_9010-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: optiplex-7010_9010-hotp-maximized target: optiplex-7010_9010-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: optiplex-7010_9010_TXT-maximized target: optiplex-7010_9010_TXT-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: optiplex-7010_9010_TXT-hotp-maximized target: optiplex-7010_9010_TXT-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: x230-maximized-fhd_edp target: x230-maximized-fhd_edp subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: x230-hotp-maximized-fhd_edp target: x230-hotp-maximized-fhd_edp subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: w530-hotp-maximized target: w530-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t430-maximized target: t430-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: w530-maximized target: w530-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t530-maximized target: t530-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: t530-hotp-maximized target: t530-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: UNTESTED_t440p-maximized target: UNTESTED_t440p-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: UNTESTED_t440p-hotp-maximized target: UNTESTED_t440p-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: UNTESTED_w541-maximized target: UNTESTED_w541-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: UNTESTED_w541-hotp-maximized target: UNTESTED_w541-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: qemu-coreboot-fbwhiptail-tpm2-hotp target: qemu-coreboot-fbwhiptail-tpm2-hotp subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: z220-cmt-maximized target: z220-cmt-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized - build: name: z220-cmt-hotp-maximized target: z220-cmt-hotp-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized # coreboot purism # librem boards @@ -513,11 +513,11 @@ workflows: # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache - build: - name: UNMAINTAINED_t480-maximized - target: UNMAINTAINED_t480-maximized + name: t480-maximized + target: t480-maximized subcommand: "" requires: - - x230-hotp-maximized + - t480-hotp-maximized # dasharo release, share 24.02.01 utils/crossgcc - build: diff --git a/unmaintained_boards/UNMAINTAINED_t480-hotp-maximized/UNMAINTAINED_t480-hotp-maximized.config b/boards/t480-hotp-maximized/t480-hotp-maximized.config similarity index 100% rename from unmaintained_boards/UNMAINTAINED_t480-hotp-maximized/UNMAINTAINED_t480-hotp-maximized.config rename to boards/t480-hotp-maximized/t480-hotp-maximized.config diff --git a/unmaintained_boards/UNMAINTAINED_t480-maximized/UNMAINTAINED_t480-maximized.config b/boards/t480-maximized/t480-maximized.config similarity index 97% rename from unmaintained_boards/UNMAINTAINED_t480-maximized/UNMAINTAINED_t480-maximized.config rename to boards/t480-maximized/t480-maximized.config index 984fd805..92fcacd8 100644 --- a/unmaintained_boards/UNMAINTAINED_t480-maximized/UNMAINTAINED_t480-maximized.config +++ b/boards/t480-maximized/t480-maximized.config @@ -23,7 +23,7 @@ export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=24.12 export CONFIG_LINUX_VERSION=6.1.8 -CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_t480-maximized.config +CONFIG_COREBOOT_CONFIG=config/coreboot-t480-maximized.config CONFIG_LINUX_CONFIG=config/linux-t480.config #On-demand hardware support (modules.cpio)