From cf9d10adebf489fc0cf459d7734ba8fe7183c061 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 22 Jul 2024 15:07:15 -0400 Subject: [PATCH] t530(-hotp)-maximized: move+ rename to boards/* + unify with x230-maximized boards for 24.02.01 + add Makefile helper + add back to CircleCI Signed-off-by: Thierry Laurion --- .circleci/config.yml | 11 ++++++-- BOARD_TESTERS.md | 2 +- Makefile | 13 ++++++++++ .../t530-hotp-maximized.config | 2 +- .../t530-maximized.config} | 0 config/coreboot-t530-maximized.config | 26 ++++++++----------- 6 files changed, 35 insertions(+), 19 deletions(-) rename unmaintained_boards/UNMAINTAINED_t530-hotp-maximized/UNMAINTAINED_t530-hotp-maximized.config => boards/t530-hotp-maximized/t530-hotp-maximized.config (98%) rename boards/{UNMAINTAINED_t530-maximized/UNMAINTAINED_t530-maximized.config => t530-maximized/t530-maximized.config} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17226064..e30f374a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -384,8 +384,15 @@ workflows: - x230-hotp-maximized - build: - name: UNMAINTAINED_t530-maximized - target: UNMAINTAINED_t530-maximized + name: t530-maximized + target: t530-maximized + subcommand: "" + requires: + - x230-hotp-maximized + + - build: + name: t530-hotp-maximized + target: t530-hotp-maximized subcommand: "" requires: - x230-hotp-maximized diff --git a/BOARD_TESTERS.md b/BOARD_TESTERS.md index b15d3cfc..d9337590 100644 --- a/BOARD_TESTERS.md +++ b/BOARD_TESTERS.md @@ -24,7 +24,7 @@ xx30 (Ivy): - [ ] w530 (xx30): @eganonoa @zifxify @weyounsix (dGPU: w530-k2000m) @jnscmns (dGPU K1000M) @computer-user123 (w530 / & w530 k2000 : prefers iGPU) - [ ] x230 (xx30): @nestire(x230-legacy, x230-maximized) @tlaurion(maximized) @osresearch @merge @jan23 @MrChromebox @shamen123 @eganonoa @bwachter @Thrilleratplay @jnscmns @doob85 @natterangell (x230i variant: irrelevant individual board) - [ ] x230-fhd/edp variant: @n4ru @computer-user123 (nitro caster board) @Tonux599 @househead @pcm720 (eDP 4.0 board and 1440p display) -- [ ] t530 (xx30): @fhvyhjriur @3hhh (Currently UNMAINTAINED_t530-maximized: opportunity to mainstream and close https://github.com/linuxboot/heads/issues/1682) +- [ ] t530 (xx30): @fhvyhjriur @3hhh (Opportunity to mainstream and close https://github.com/linuxboot/heads/issues/1682) xx4x(Haswell): === diff --git a/Makefile b/Makefile index 9ba5426b..c952ab00 100644 --- a/Makefile +++ b/Makefile @@ -801,6 +801,19 @@ board.move_untested_to_tested: echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \ sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml +board.move_unmaintained_to_tested: + @echo "NEW_BOARD variable will remove UNMAINTAINED_ prefix from $(BOARD)" + @NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNMAINTAINED_//'); \ + echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \ + mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \ + echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \ + rm -rf boards/$$NEW_BOARD; \ + mv boards/$$BOARD boards/$$NEW_BOARD; \ + echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \ + sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml; \ + echo "Board $$BOARD has been moved to tested status as $$NEW_BOARD"; \ + echo "Please review and update .circleci/config.yml manually if needed" + board.move_untested_to_unmaintained: @echo "NEW_BOARD variable will move from UNTESTED_ to UNMAINTAINED_ from $(BOARD)" @NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_/UNMAINTAINED_/g'); \ diff --git a/unmaintained_boards/UNMAINTAINED_t530-hotp-maximized/UNMAINTAINED_t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config similarity index 98% rename from unmaintained_boards/UNMAINTAINED_t530-hotp-maximized/UNMAINTAINED_t530-hotp-maximized.config rename to boards/t530-hotp-maximized/t530-hotp-maximized.config index 28262a32..55a5b36b 100644 --- a/unmaintained_boards/UNMAINTAINED_t530-hotp-maximized/UNMAINTAINED_t530-hotp-maximized.config +++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config @@ -8,7 +8,7 @@ # - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) # This board is designed for a t530 without a dGPU. It will work just fine for a board with a dGPU, except you will not be able to use an external monitor via the mini-displayport or the dock's displayport, though external monitors will work via VGA ports. To initialize the dGPU please use one of the dgpu boards. export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.22.01 +export CONFIG_COREBOOT_VERSION=24.02.01 export CONFIG_LINUX_VERSION=5.10.5 CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config diff --git a/boards/UNMAINTAINED_t530-maximized/UNMAINTAINED_t530-maximized.config b/boards/t530-maximized/t530-maximized.config similarity index 100% rename from boards/UNMAINTAINED_t530-maximized/UNMAINTAINED_t530-maximized.config rename to boards/t530-maximized/t530-maximized.config diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config index 994fa026..b7f4c2c2 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -17,18 +17,15 @@ CONFIG_ARCH_SUPPORTS_CLANG=y # CONFIG_IWYU is not set # CONFIG_FMD_GENPARSER is not set # CONFIG_UTIL_GENPARSER is not set -# CONFIG_OPTION_BACKEND_NONE is not set -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y +CONFIG_OPTION_BACKEND_NONE=y +# CONFIG_USE_OPTION_TABLE is not set CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y -# CONFIG_TIMESTAMPS_ON_CONSOLE is not set -CONFIG_USE_BLOBS=y -# CONFIG_USE_AMD_BLOBS is not set -# CONFIG_USE_QC_BLOBS is not set +CONFIG_TIMESTAMPS_ON_CONSOLE=y +# CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -322,7 +319,7 @@ CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_REQUESTED_VOLTAGE is not set # CONFIG_RAMINIT_ALWAYS_ALLOW_DLL_OFF is not set -CONFIG_RAMINIT_ENABLE_ECC=y +# CONFIG_RAMINIT_ENABLE_ECC is not set # # Southbridge @@ -436,9 +433,7 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 -CONFIG_PCI_ALLOW_BUS_MASTER=y -CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y -CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y +# CONFIG_PCI_ALLOW_BUS_MASTER is not set # CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set # CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y @@ -593,18 +588,18 @@ CONFIG_CONSOLE_CBMEM=y # CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_CONSOLE_I2C_SMBUS is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL=5 +CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y CONFIG_CONSOLE_USE_ANSI_ESCAPES=y -CONFIG_HWBASE_DEBUG_NULL=y +CONFIG_HWBASE_DEBUG_CB=y # end of Console CONFIG_HAVE_ACPI_RESUME=y @@ -683,6 +678,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SMBUS is not set +# CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_CONSOLE_INIT is not set # CONFIG_DEBUG_SPI_FLASH is not set # CONFIG_DEBUG_BOOT_STATE is not set