Merge remote-tracking branch 'osresearch/master' into mdrobnak-google_omnigul

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Author: tlaurion

.circleci/config.yml

@@ -16,7 +16,10 @@ commands:
             echo "Sourcing /devenv.sh since docker entrypoint doesn't do it as expected"
             source /devenv.sh
             rm -rf build/<< parameters.arch >>/<< parameters.target >>/* build/<< parameters.arch >>/log/*
-            make V=1 BOARD=<< parameters.target >> << parameters.subcommand >>  | ts || touch ./tmpDir/failed_build
+            #Pass AVAILABLE_MEM_GB=8 to respect CircleCI free tier RAM assignation, which otherwise randomly fails. See Makefile calculations.
+            # Without AVAILABLE_MEM_GB=8: CircleCI passes '-j36 --load-average=54'
+            # With AVAILABLE_MEM_GB=8: CircleCI passes '-j8 --load-average=12'
+            make V=1 BOARD=<< parameters.target >> << parameters.subcommand >> AVAILABLE_MEM_GB=8  | ts || touch ./tmpDir/failed_build
           no_output_timeout: 3h
       - run:
           name: Output hashes
@@ -91,11 +94,15 @@ jobs:
           name: Download Optiplex 7010/9010 blobs
           command: |
             ./blobs/xx30/optiplex_7010_9010.sh ./blobs/xx30
+      # me_cleaner.py present under heads blobs/utils/me_cleaner dir comes from https://github.com/corna/me_cleaner/blob/43612a630c79f3bc6f2653bfe90dfe0b7b137e08/me_cleaner.py
       - run:
-          # me_cleaner.py present under heads xx30 blobs dir comes from https://github.com/corna/me_cleaner/blob/43612a630c79f3bc6f2653bfe90dfe0b7b137e08/me_cleaner.py
           name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
-            ./blobs/xx30/download_clean_me_manually.sh -m $(readlink -f ./blobs/xx30/me_cleaner.py)
+            ./blobs/xx30/download_clean_me_manually.sh -m $(readlink -f ./blobs/utils/me_cleaner/me_cleaner.py)
+      - run:
+          name: Download, neuter and deguard xx80 ME (keep generated GBE and extracted IFD in tree)
+          command: |
+            ./blobs/xx80/download_clean_deguard_me_pad_tb.sh -m $(readlink -f ./blobs/utils/me_cleaner/me_cleaner.py) ./blobs/xx80/
       - run:
           name: Download and extract t530 vbios roms for dgpu boards
           command: |
@@ -188,8 +195,8 @@ jobs:
             - build/ppc64/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
             - build/x86/coreboot-4.11
             - build/x86/coreboot-24.02.01
+            - build/x86/coreboot-24.12
             - build/x86/coreboot-dasharo
-            - build/x86/coreboot-mrchromebox
             - build/x86/coreboot-purism
             - build/x86/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
             - crossgcc
@@ -231,39 +238,27 @@ workflows:
 
       # coreboot 24.02.01
       - build_and_persist:
-          name: x230-hotp-maximized
-          target: x230-hotp-maximized
-          subcommand: ""
-          requires:
-            - x86-musl-cross-make
-
-      # coreboot-git mrchromebox
-      - build:
-          name: omnigul
-          target: omnigul
+          name: novacustom-nv4x_adl
+          target: novacustom-nv4x_adl
           subcommand: ""
           requires:
             - x86-musl-cross-make
 
-      # coreboot purism
+      # coreboot purism: based on coreboot 24.02.01, reuse dasharo 24.02.01 crossgcc
       - build_and_persist:
           name: librem_14
           target: librem_14
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - novacustom-nv4x_adl
 
-      # coreboot nitropad
-      # Nitropads depending on x230-hotp-maximized cache since kernel is 6.x and coreboot is git is unshared
-      # We use nitropad's coreboot's fork crossgcc
-      # No need to wait further for other board's cache
-      # We reuse built modules from x230-hotp-maximized cache only
+      # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache
       - build_and_persist:
-          name: novacustom-nv4x_adl
-          target: novacustom-nv4x_adl
+          name: t480-hotp-maximized
+          target: t480-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       # coreboot talos_2
       - build_and_persist:
@@ -287,186 +282,199 @@ workflows:
       - save_cache:
           requires:
             - UNTESTED_talos-2
-            - librem_14
+            - t480-hotp-maximized
 
       # Those onboarding new boards should add their entries below.
-      # coreboot 24.02.01 boards
+      # coreboot 24.12 boards
       - build:
           name: x220-hotp-maximized
           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
-
-      - 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:
           name: optiplex-7010_9010-maximized
           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-hotp-maximized
+          target: x230-hotp-maximized
+          subcommand: ""
+          requires:
+            - t480-hotp-maximized
+
+      - build:
+          name: x230-hotp-maximized_usb-kb
+          target: x230-hotp-maximized_usb-kb
+          subcommand: ""
+          requires:
+            - 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
+          name: UNTESTED_t530-maximized
+          target: UNTESTED_t530-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
-          name: t530-hotp-maximized
-          target: t530-hotp-maximized
+          name: UNTESTED_t530-hotp-maximized
+          target: UNTESTED_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
+          name: UNTESTED_z220-cmt-maximized
+          target: UNTESTED_z220-cmt-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
-          name: z220-cmt-hotp-maximized
-          target: z220-cmt-hotp-maximized
+          name: UNTESTED_z220-cmt-hotp-maximized
+          target: UNTESTED_z220-cmt-hotp-maximized
+          subcommand: ""
+          requires:
+            - t480-hotp-maximized
+
+      # coreboot-git mrchromebox, based on 24.12
+      - build:
+          name: omnigul
+          target: omnigul
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       # coreboot purism
       # librem boards
@@ -519,6 +527,14 @@ workflows:
           requires:
             - librem_14
 
+      # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache
+      - build:
+          name: t480-maximized
+          target: t480-maximized
+          subcommand: ""
+          requires:
+            - t480-hotp-maximized
+
       # dasharo release, share 24.02.01 utils/crossgcc
       - build:
           name: UNTESTED_nitropad-ns50
@@ -527,48 +543,17 @@ workflows:
           requires:
             - novacustom-nv4x_adl
 
+      #NovaCustom v56 boards are based on coreboot 24.02.01 fork, so depend on x230
       - build:
           name: novacustom-v560tu
           target: novacustom-v560tu
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - novacustom-nv4x_adl
 
       - build:
           name: novacustom-v540tu
           target: novacustom-v540tu
           subcommand: ""
           requires:
-            - x230-hotp-maximized
-            
-      # coreboot 4.11
-      - build:
-          name: UNMAINTAINED_kgpe-d16_workstation
-          target: UNMAINTAINED_kgpe-d16_workstation
-          subcommand: ""
-          requires:
-            - librem_l1um
-
-      # coreboot 4.11
-      - build:
-          name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
-          target: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
-          subcommand: ""
-          requires:
-            - librem_l1um
-
-      # coreboot 4.11
-      - build:
-          name: UNMAINTAINED_kgpe-d16_server
-          target: UNMAINTAINED_kgpe-d16_server
-          subcommand: ""
-          requires:
-            - librem_l1um
-
-      # coreboot 4.11
-      - build:
-          name: UNMAINTAINED_kgpe-d16_server-whiptail
-          target: UNMAINTAINED_kgpe-d16_server-whiptail
-          subcommand: ""
-          requires:
-            - librem_l1um
+            - novacustom-nv4x_adl