Merge pull request #1398 from tlaurion/staging_all

linuxboot · Jul 4, 2023 · dba8f6a · dba8f6a
2 parents 91f65be + f8cb3db
commit dba8f6a
Show file tree

Hide file tree

Showing 109 changed files with 37,118 additions and 1,687 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -193,6 +193,7 @@ jobs:
             - build/x86/coreboot-4.14
             - build/x86/coreboot-4.15
             - build/x86/coreboot-4.17
+            - build/x86/coreboot-4.19
             - build/ppc64/coreboot-git
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
@@ -250,6 +251,7 @@ workflows:
 #
 #
 
+#Coreboot 4.19 boards
       - build:
           name: x220-hotp-maximized
           target: x220-hotp-maximized
@@ -265,29 +267,29 @@ workflows:
             - x230-hotp-maximized
 
       - build:
-          name: t420-hotp-maximized
-          target: t420-hotp-maximized
+          name: UNTESTED_t420-hotp-maximized
+          target: UNTESTED_t420-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t520-hotp-maximized
-          target: t520-hotp-maximized
+          name: UNTESTED_t520-hotp-maximized
+          target: UNTESTED_t520-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t420-maximized
-          target: t420-maximized
+          name: UNTESTED_t420-maximized
+          target: UNTESTED_t420-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t520-maximized
-          target: t520-maximized
+          name: UNTESTED_t520-maximized
+          target: UNTESTED_t520-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
@@ -356,50 +358,50 @@ workflows:
             - x230-hotp-maximized
 
       - build:
-          name: x230-maximized-fhd_edp
-          target: x230-maximized-fhd_edp
+          name: UNTESTED_x230-maximized-fhd_edp
+          target: UNTESTED_x230-maximized-fhd_edp
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: x230-hotp-maximized-fhd_edp
-          target: x230-hotp-maximized-fhd_edp
+          name: UNTESTED_x230-hotp-maximized-fhd_edp
+          target: UNTESTED_x230-hotp-maximized-fhd_edp
           subcommand: ""
           requires:
             - x230-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
 
       - build:
-          name: t530-dgpu-hotp-maximized
-          target: t530-dgpu-hotp-maximized
+          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
+          name: UNTESTED_w530-hotp-maximized
+          target: UNTESTED_w530-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w530-dgpu-K1000m-hotp-maximized
-          target: w530-dgpu-K1000m-hotp-maximized
+          name: UNTESTED_w530-dgpu-K1000m-hotp-maximized
+          target: UNTESTED_w530-dgpu-K1000m-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized  
 
       - build:
-          name: w530-dgpu-K2000m-hotp-maximized
-          target: w530-dgpu-K2000m-hotp-maximized
+          name: UNTESTED_w530-dgpu-K2000m-hotp-maximized
+          target: UNTESTED_w530-dgpu-K2000m-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized  
@@ -412,36 +414,36 @@ workflows:
             - x230-hotp-maximized
 
       - build:
-          name: t530-maximized
-          target: t530-maximized
+          name: UNTESTED_t530-maximized
+          target: UNTESTED_t530-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t530-dgpu-maximized
-          target: t530-dgpu-maximized
+          name: UNTESTED_t530-dgpu-maximized
+          target: UNTESTED_t530-dgpu-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w530-maximized
-          target: w530-maximized
+          name: UNTESTED_w530-maximized
+          target: UNTESTED_w530-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w530-dgpu-K1000m-maximized
-          target: w530-dgpu-K1000m-maximized
+          name: UNTESTED_w530-dgpu-K1000m-maximized
+          target: UNTESTED_w530-dgpu-K1000m-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w530-dgpu-K2000m-maximized
-          target: w530-dgpu-K2000m-maximized
+          name: UNTESTED_w530-dgpu-K2000m-maximized
+          target: UNTESTED_w530-dgpu-K2000m-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
@@ -451,36 +453,37 @@ workflows:
           target: t440p-maximized
           subcommand: ""
           requires:
-            - librem_14
+            - x230-hotp-maximized 
 
       - build:
           name: t440p-hotp-maximized
           target: t440p-hotp-maximized
           subcommand: ""
           requires:
-            - librem_14
+            - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot
-          target: qemu-coreboot
+          name: qemu-coreboot-fbwhiptail-tpm2-hotp
+          target: qemu-coreboot-fbwhiptail-tpm2-hotp
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot-fbwhiptail
-          target: qemu-coreboot-fbwhiptail
+          name: UNTESTED_p8z77-m_pro-tpm1-maximized
+          target: UNTESTED_p8z77-m_pro-tpm1-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot-fbwhiptail-tpm2-hotp
-          target: qemu-coreboot-fbwhiptail-tpm2-hotp
+          name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
+          target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
+#Coreboot 4.17 boards
       - build:
           name: librem_13v2
           target: librem_13v2
@@ -523,40 +526,26 @@ workflows:
           requires:
             - librem_14
 
-      - build:
-          name: p8z77-m_pro-tpm1-maximized
-          target: p8z77-m_pro-tpm1-maximized
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: p8z77-m_pro-tpm1-hotp-maximized
-          target: p8z77-m_pro-tpm1-hotp-maximized
-          subcommand: ""
-          requires:
-            - librem_14
-
 #      - build:
-#          name: kgpe-d16_workstation-usb_keyboard
-#          target: kgpe-d16_workstation-usb_keyboard
+#          name: UNTESTED_kgpe-d16_workstation-usb_keyboard
+#          target: UNTESTED_kgpe-d16_workstation-usb_keyboard
 #          subcommand: ""
 #          requires:
-#            - kgpe-d16_workstation
+#            - UNTESTED_kgpe-d16_workstation
 
 #      - build:
-#          name: kgpe-d16_server
-#          target: kgpe-d16_server
+#          name: UNTESTED_kgpe-d16_server
+#          target: UNTESTED_kgpe-d16_server
 #          subcommand: ""
 #          requires:
-#            - kgpe-d16_workstation
+#            - UNTESTED_kgpe-d16_workstation
 
 #      - build:
-#          name: kgpe-d16_server-whiptail
-#          target: kgpe-d16_server-whiptail
+#          name: UNTESTED_kgpe-d16_server-whiptail
+#          target: UNTESTED_kgpe-d16_server-whiptail
 #          subcommand: ""
 #          requires:
-#            - kgpe-d16_workstation
+#            - UNTESTED_kgpe-d16_workstation
 
 #      - build:
 #          name: librem_l1um
@@ -573,24 +562,24 @@ workflows:
 # linuxboot steps need something to pass in the kernel header path
 # skipping for now
 #      - run:
-#          name: qemu-linuxboot-edk2
+#          name: UNTESTED_qemu-linuxboot-edk2
 #          command: |
 #            ./build/make-4.2.1/make \
 #                CROSS=/cross/bin/x86_64-linux-musl- \
-#                BOARD=qemu-linuxboot \
+#                BOARD=UNTESTED_qemu-linuxboot \
 #                `/bin/pwd`/build/linuxboot-git/build/qemu/.configured \
 #                # Run first to avoid too many processes
 #
 #      - run:
-#          name: qemu-linuxboot
+#          name: UNTESTED_qemu-linuxboot
 #          command: |
 #            ./build/make-4.2.1/make \
 #                CROSS=/cross/bin/x86_64-linux-musl- \
 #                CPUS=16 \
 #                V=1 \
-#                BOARD=qemu-linuxboot \
+#                BOARD=UNTESTED_qemu-linuxboot \
 #
 #      - store-artifacts:
-#          path: build/qemu-linuxboot/linuxboot.rom
+#          path: build/UNTESTED_qemu-linuxboot/linuxboot.rom
 #      - store-artifacts:
-#          path: build/qemu-linuxboot/hashes.txt
+#          path: build/UNTESTED_qemu-linuxboot/hashes.txt
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ WGET ?= wget
 # Timestamps should be in ISO format
 DATE=`date --rfc-3339=seconds`
 
-BOARD		?= qemu-coreboot
+BOARD		?= qemu-coreboot-fbwhiptail-tpm1
 CONFIG		:= $(pwd)/boards/$(BOARD)/$(BOARD).config
 
 ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"

diff --git a/blobs/ThePlexus-bootsplash-1024x768.jpg b/blobs/ThePlexus-bootsplash-1024x768.jpg
diff --git a/blobs/ThePlexus-logo.jpg b/blobs/ThePlexus-logo.jpg
diff --git a/blobs/bootsplash-1024x768.jpg b/blobs/bootsplash-1024x768.jpg
@@ -0,0 +1 @@
+ThePlexus-bootsplash-1024x768.jpg
diff --git a/blobs/d-dwid-janus-hexa_background-bootsplash-1024x768.jpg b/blobs/d-dwid-janus-hexa_background-bootsplash-1024x768.jpg
diff --git a/blobs/d-dwid-janus-hexa_background-logo.jpg b/blobs/d-dwid-janus-hexa_background-logo.jpg
diff --git a/blobs/d-dwid_janus_variant_of_ThePlexus-bootsplash-1024x768.jpg b/blobs/d-dwid_janus_variant_of_ThePlexus-bootsplash-1024x768.jpg
diff --git a/...-whiptail/kgpe-d16_server-whiptail.config → .../UNTESTED_kgpe-d16_server-whiptail.config b/...-whiptail/kgpe-d16_server-whiptail.config → .../UNTESTED_kgpe-d16_server-whiptail.config
diff --git a/...ds/kgpe-d16_server/kgpe-d16_server.config → ...16_server/UNTESTED_kgpe-d16_server.config b/...ds/kgpe-d16_server/kgpe-d16_server.config → ...16_server/UNTESTED_kgpe-d16_server.config
diff --git a/.../kgpe-d16_workstation-usb_keyboard.config → ..._kgpe-d16_workstation-usb_keyboard.config b/.../kgpe-d16_workstation-usb_keyboard.config → ..._kgpe-d16_workstation-usb_keyboard.config
diff --git a/...6_workstation/kgpe-d16_workstation.config → ...tion/UNTESTED_kgpe-d16_workstation.config b/...6_workstation/kgpe-d16_workstation.config → ...tion/UNTESTED_kgpe-d16_workstation.config
diff --git a/boards/leopard/leopard.config → .../UNTESTED_leopard/UNTESTED_leopard.config b/boards/leopard/leopard.config → .../UNTESTED_leopard/UNTESTED_leopard.config
diff --git a/...ed/p8z77-m_pro-tpm1-hotp-maximized.config → ...ED_p8z77-m_pro-tpm1-hotp-maximized.config b/...ed/p8z77-m_pro-tpm1-hotp-maximized.config → ...ED_p8z77-m_pro-tpm1-hotp-maximized.config
@@ -1,5 +1,5 @@
 # Inherit the rest from the base Asus P8Z77-M Pro config.
-include $(pwd)/boards/p8z77-m_pro-tpm1-maximized/p8z77-m_pro-tpm1-maximized.config
+include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config
 
 CONFIG_HOTPKEY=y
 

diff --git a/...ximized/p8z77-m_pro-tpm1-maximized.config → ...NTESTED_p8z77-m_pro-tpm1-maximized.config b/...ximized/p8z77-m_pro-tpm1-maximized.config → ...NTESTED_p8z77-m_pro-tpm1-maximized.config
@@ -39,8 +39,8 @@ CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
 CONFIG_COREBOOT_CONFIG=config/coreboot-p8z77-m_pro-tpm1.config
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.17
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_COREBOOT_VERSION=4.19
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y

diff --git a/boards/qemu-linuxboot/qemu-linuxboot.config → ...-linuxboot/UNTESTED_qemu-linuxboot.config b/boards/qemu-linuxboot/qemu-linuxboot.config → ...-linuxboot/UNTESTED_qemu-linuxboot.config
diff --git a/boards/r630/r630.config → boards/UNTESTED_r630/UNTESTED_r630.config b/boards/r630/r630.config → boards/UNTESTED_r630/UNTESTED_r630.config
diff --git a/boards/s2600wf/s2600wf.config → .../UNTESTED_s2600wf/UNTESTED_s2600wf.config b/boards/s2600wf/s2600wf.config → .../UNTESTED_s2600wf/UNTESTED_s2600wf.config
diff --git a/...hotp-maximized/t420-hotp-maximized.config → ...mized/UNTESTED_t420-hotp-maximized.config b/...hotp-maximized/t420-hotp-maximized.config → ...mized/UNTESTED_t420-hotp-maximized.config
@@ -10,7 +10,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/boards/t420-maximized/t420-maximized.config → ...-maximized/UNTESTED_t420-maximized.config b/boards/t420-maximized/t420-maximized.config → ...-maximized/UNTESTED_t420-maximized.config
@@ -9,7 +9,7 @@
 # - dropbear
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/boards/t420/t420.config → boards/UNTESTED_t420/UNTESTED_t420.config b/boards/t420/t420.config → boards/UNTESTED_t420/UNTESTED_t420.config
@@ -1,7 +1,7 @@
 # Configuration for a t420 running Qubes 4.1 and other OS, X220 is identical to X230 on the Linux Side of things.
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
 CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config

diff --git a/...hotp-maximized/t520-hotp-maximized.config → ...mized/UNTESTED_t520-hotp-maximized.config b/...hotp-maximized/t520-hotp-maximized.config → ...mized/UNTESTED_t520-hotp-maximized.config
@@ -6,7 +6,7 @@
 #   - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/boards/t520-maximized/t520-maximized.config → ...-maximized/UNTESTED_t520-maximized.config b/boards/t520-maximized/t520-maximized.config → ...-maximized/UNTESTED_t520-maximized.config
@@ -6,7 +6,7 @@
 #   - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/...maximized/t530-dgpu-hotp-maximized.config → .../UNTESTED_t530-dgpu-hotp-maximized.config b/...maximized/t530-dgpu-hotp-maximized.config → .../UNTESTED_t530-dgpu-hotp-maximized.config
@@ -9,7 +9,7 @@
 # This board is designed for a t530 with a dGPU. Initialization of the dGPU is necessary in order to use an external monitor via the DisplayPort (either the in-built mini-DisplayPort or the DisplayPort in the dock). In order to build this the relevant script in the blobs directory must be run (or self-pulled roms placed in that directory) and after building the rom, the nvramtool must be run on the 12MB rom to change the default graphics mode away from integrated-only graphics (see README_vbios in the blobs directory).
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/...dgpu-maximized/t530-dgpu-maximized.config → ...mized/UNTESTED_t530-dgpu-maximized.config b/...dgpu-maximized/t530-dgpu-maximized.config → ...mized/UNTESTED_t530-dgpu-maximized.config
@@ -9,7 +9,7 @@
 # This board is designed for a t530 with a dGPU. Initialization of the dGPU is necessary in order to use an external monitor via the DisplayPort (either the in-built mini-DisplayPort or the DisplayPort in the dock). In order to build this the relevant script in the blobs directory must be run (or self-pulled roms placed in that directory) and after building the rom, the nvramtool must be run on the 12MB rom to change the default graphics mode away from integrated-only graphics (see README_vbios in the blobs directory).
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

diff --git a/...hotp-maximized/t530-hotp-maximized.config → ...mized/UNTESTED_t530-hotp-maximized.config b/...hotp-maximized/t530-hotp-maximized.config → ...mized/UNTESTED_t530-hotp-maximized.config
@@ -9,7 +9,7 @@
 # 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.19
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config
 CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config