Merge pull request #1604 from tlaurion/422_fhd

4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01

.circleci/config.yml

@@ -193,9 +193,10 @@ jobs:
             - build/x86/coreboot-4.14
             - build/x86/coreboot-4.15
             - build/x86/coreboot-4.17
-            - build/x86/coreboot-4.19
-            - build/x86/coreboot-git
-            - build/ppc64/coreboot-git
+            - build/x86/coreboot-4.22.01
+            - build/x86/coreboot-purism
+            - build/x86/coreboot-nitrokey
+            - build/ppc64/coreboot-talos_2
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
           key: heads-modules-and-patches-{{ checksum "./tmpDir/all_modules_and_patches.sha256sums" }}{{ .Environment.CACHE_VERSION }}
@@ -215,7 +216,7 @@ workflows:
 # version. The last board in the sequence is the dependency
 # for the parallel boards built at the end, and also save_cache.
 
-      # coreboot 4.19
+      # coreboot 4.22.01
       - build_and_persist:
           name: x230-hotp-maximized
           target: x230-hotp-maximized
@@ -256,14 +257,14 @@ workflows:
       - save_cache:
           requires:
             - talos-2
-            - nitropad-nv41
+            - librem_14
 
 #
 # Those onboarding new boards should add their entries below.
 #
 #
 
-#Coreboot 4.19 boards
+#Coreboot 4.22.01 boards
       - build:
           name: x220-hotp-maximized
           target: x220-hotp-maximized
@@ -285,55 +286,20 @@ workflows:
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_t520-hotp-maximized
-          target: UNTESTED_t520-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: t420-maximized
           target: t420-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_t520-maximized
-          target: UNTESTED_t520-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: x230-legacy-flash
           target: x230-legacy-flash
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_t430-legacy-flash
-          target: UNTESTED_t430-legacy-flash
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_t430-legacy
-          target: UNTESTED_t430-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_t430-hotp-legacy
-          target: UNTESTED_t430-hotp-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: x230-legacy
           target: x230-legacy
@@ -383,83 +349,27 @@ workflows:
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_t530-hotp-maximized
-          target: UNTESTED_t530-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_t530-dgpu-hotp-maximized
-          target: UNTESTED_t530-dgpu-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: w530-hotp-maximized
           target: w530-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_w530-dgpu-K1000m-hotp-maximized
-          target: UNTESTED_w530-dgpu-K1000m-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized  
-
-      - build:
-          name: UNTESTED_w530-dgpu-K2000m-hotp-maximized
-          target: UNTESTED_w530-dgpu-K2000m-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized  
-
       - build:
           name: t430-maximized
           target: t430-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_t530-maximized
-          target: UNTESTED_t530-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_t530-dgpu-maximized
-          target: UNTESTED_t530-dgpu-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: w530-maximized
           target: w530-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_w530-dgpu-K1000m-maximized
-          target: UNTESTED_w530-dgpu-K1000m-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_w530-dgpu-K2000m-maximized
-          target: UNTESTED_w530-dgpu-K2000m-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: t440p-maximized
           target: t440p-maximized
@@ -509,20 +419,6 @@ workflows:
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: UNTESTED_p8z77-m_pro-tpm1-maximized
-          target: UNTESTED_p8z77-m_pro-tpm1-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
-          target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
 #coreboot-git librem boards
       - build:
           name: librem_13v2
@@ -575,25 +471,25 @@ workflows:
             - nitropad-nv41
 
 #      - build:
-#          name: UNTESTED_kgpe-d16_workstation-usb_keyboard
-#          target: UNTESTED_kgpe-d16_workstation-usb_keyboard
+#          name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
+#          target: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
 #          subcommand: ""
 #          requires:
-#            - UNTESTED_kgpe-d16_workstation
+#            - UNMAINTAINED_kgpe-d16_workstation
 
 #      - build:
-#          name: UNTESTED_kgpe-d16_server
-#          target: UNTESTED_kgpe-d16_server
+#          name: UNMAINTAINED_kgpe-d16_server
+#          target: UNMAINTAINED_kgpe-d16_server
 #          subcommand: ""
 #          requires:
-#            - UNTESTED_kgpe-d16_workstation
+#            - UNMAINTAINED_kgpe-d16_workstation
 
 #      - build:
-#          name: UNTESTED_kgpe-d16_server-whiptail
-#          target: UNTESTED_kgpe-d16_server-whiptail
+#          name: UNMAINTAINED_kgpe-d16_server-whiptail
+#          target: UNMAINTAINED_kgpe-d16_server-whiptail
 #          subcommand: ""
 #          requires:
-#            - UNTESTED_kgpe-d16_workstation
+#            - UNMAINTAINED_kgpe-d16_workstation
 
 #      - build:
 #          name: librem_l1um
@@ -610,24 +506,24 @@ workflows:
 # linuxboot steps need something to pass in the kernel header path
 # skipping for now
 #      - run:
-#          name: UNTESTED_qemu-linuxboot-edk2
+#          name: UNMAINTAINED_qemu-linuxboot-edk2
 #          command: |
 #            ./build/make-4.2.1/make \
 #                CROSS=/cross/bin/x86_64-linux-musl- \
-#                BOARD=UNTESTED_qemu-linuxboot \
+#                BOARD=UNMAINTAINED_qemu-linuxboot \
 #                `/bin/pwd`/build/linuxboot-git/build/qemu/.configured \
 #                # Run first to avoid too many processes
 #
 #      - run:
-#          name: UNTESTED_qemu-linuxboot
+#          name: UNMAINTAINED_qemu-linuxboot
 #          command: |
 #            ./build/make-4.2.1/make \
 #                CROSS=/cross/bin/x86_64-linux-musl- \
 #                CPUS=16 \
 #                V=1 \
-#                BOARD=UNTESTED_qemu-linuxboot \
+#                BOARD=UNMAINTAINED_qemu-linuxboot \
 #
 #      - store-artifacts:
-#          path: build/UNTESTED_qemu-linuxboot/linuxboot.rom
+#          path: build/UNMAINTAINED_qemu-linuxboot/linuxboot.rom
 #      - store-artifacts:
-#          path: build/UNTESTED_qemu-linuxboot/hashes.txt
+#          path: build/UNMAINTAINED_qemu-linuxboot/hashes.txt

Makefile

@@ -748,6 +748,18 @@ 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_untested_to_unmaintained:
+	@echo "NEW_BOARD variable will move from UNTESTED_ to UNMAINTAINED_ from $(BOARD)"
+	@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_/UNMAINTAINED_/g'); \
+	echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
+	mkdir -p unmaintained_boards; \
+	mv boards/$$BOARD/$$BOARD.config unmaintained_boards/$$BOARD/$$NEW_BOARD.config; \
+	echo "Renaming boards/$$BOARD to unmaintainted_boards/$$NEW_BOARD"; \
+	rm -rf boards/$$NEW_BOARD; \
+	mv boards/$$BOARD unmaintained_boards/$$NEW_BOARD; \
+	echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml. Delete manually entries"; \
+	sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml
+
 board.move_tested_to_untested:
 	@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
 	@NEW_BOARD=UNTESTED_$(BOARD); \

boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config

@@ -5,7 +5,7 @@
 # Nitrokey Pro can also be used by forwarding the USB device from the host to
 # the VM.
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config

@@ -3,7 +3,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 1.2).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config

@@ -4,7 +4,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 2.0).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config

@@ -3,7 +3,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 2.0).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config

@@ -5,7 +5,7 @@
 # Nitrokey Pro can also be used by forwarding the USB device from the host to
 # the VM.
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config

@@ -3,7 +3,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 1.2).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing))

boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config

@@ -4,7 +4,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 2.0).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config

@@ -3,7 +3,7 @@
 #
 # TPM can be used with a qemu software TPM (TIS, 2.0).
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 #Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

boards/t420-hotp-maximized/t420-hotp-maximized.config

@@ -9,7 +9,7 @@
 # - dropbear
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config

boards/t420-maximized/t420-maximized.config

@@ -8,7 +8,7 @@
 # Doesn't include (to fit in 7mb image)
 # - dropbear
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config

boards/t430-hotp-maximized/t430-hotp-maximized.config

@@ -7,7 +7,7 @@
 #
 # - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config

boards/t430-maximized/t430-maximized.config

@@ -7,7 +7,7 @@
 #
 # - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config