From a1b12b0a74bb85200889099be6b3e4547706c2cc Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Fri, 5 Apr 2024 23:38:54 +0100 Subject: [PATCH 1/5] move `kgpe-d16_workstation` out of unmaintained Signed-off-by: Thomas Clarke --- .../kgpe-d16_workstation/kgpe-d16_workstation.config | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename unmaintained_boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config => boards/kgpe-d16_workstation/kgpe-d16_workstation.config (100%) diff --git a/unmaintained_boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config similarity index 100% rename from unmaintained_boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config rename to boards/kgpe-d16_workstation/kgpe-d16_workstation.config From 9677467078ad4740742823de2cfcfefe88f19d42 Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Sat, 6 Apr 2024 02:14:53 +0100 Subject: [PATCH 2/5] use dasharo as coreboot for kgpe-d16_workstation credit: Thierry Laurion (tlaurion) https://github.com/linuxboot/heads/pull/1303/commits/842eda22326b9433dcea484de42046c923d6ae56#diff-18936189b28399cf48703d0c1ec1df33e57c559de2a12f4438be00e6813bdb68 Signed-off-by: Thomas Clarke --- boards/kgpe-d16_workstation/kgpe-d16_workstation.config | 2 +- modules/coreboot | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config index 6cee65ca1..8b057af5a 100644 --- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config +++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config @@ -16,7 +16,7 @@ export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.11 +export CONFIG_COREBOOT_VERSION=dasharo-kgpe-d16 export CONFIG_LINUX_VERSION=5.10.5 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config diff --git a/modules/coreboot b/modules/coreboot index 718508e63..03b5f4aba 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -88,6 +88,13 @@ coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git coreboot-purism_commit_hash := 0d57cff58fba2f3a4d3a714a4eae65753e58c6ff $(eval $(call coreboot_module,purism,)) +coreboot-dasharo-kgpe-d16_repo := https://github.com/Dasharo/coreboot +coreboot-dasharo-kgpe-d16_commit_hash := 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5 +ifeq "$(CONFIG_COREBOOT_VERSION)" "dasharo-kgpe-d16" + EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-error=packed-not-aligned -Wno-error=address-of-packed-member -Wno-error=null-dereference +endif +$(eval $(call coreboot_module,dasharo-kgpe-d16,)) + #Nitrokey nv41/ns50 are based on Dasharo coreboot port, # with patches staging under coreboot-clevo_release coreboot-nitrokey_repo := https://github.com/dasharo/coreboot From 280b5a12f29ebdbff1f338a31301c593d42b1969 Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Sat, 6 Apr 2024 02:22:22 +0100 Subject: [PATCH 3/5] REVERT ME - remove all boards from CI to test kgpe-d16 Signed-off-by: Thomas Clarke --- .circleci/config.yml | 492 +++++++++++++++++++++---------------------- 1 file changed, 246 insertions(+), 246 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0bff5776..09fcc6ab7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -216,48 +216,48 @@ 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.22.01 - - build_and_persist: - name: x230-hotp-maximized - target: x230-hotp-maximized - subcommand: "" - requires: - - prep_env - - # coreboot-git librems - - build_and_persist: - name: librem_14 - target: librem_14 - subcommand: "" - requires: - - x230-hotp-maximized - - # coreboot-git 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 - - build_and_persist: - name: nitropad-nv41 - target: nitropad-nv41 - subcommand: "" - requires: - - x230-hotp-maximized - - # coreboot-git Talos II (PPC) - - build_and_persist: - name: talos-2 - arch: ppc64 - target: talos-2 - subcommand: "" - requires: - - prep_env - - #Cache one workspace per architecture. Make sure workspace caches are chainloaded and the last in chain for an arch is saved. - - save_cache: - requires: - - talos-2 - - librem_14 +# # coreboot 4.22.01 +# - build_and_persist: +# name: x230-hotp-maximized +# target: x230-hotp-maximized +# subcommand: "" +# requires: +# - prep_env +# +# # coreboot-git librems +# - build_and_persist: +# name: librem_14 +# target: librem_14 +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# # coreboot-git 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 +# - build_and_persist: +# name: nitropad-nv41 +# target: nitropad-nv41 +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# # coreboot-git Talos II (PPC) +# - build_and_persist: +# name: talos-2 +# arch: ppc64 +# target: talos-2 +# subcommand: "" +# requires: +# - prep_env +# +# #Cache one workspace per architecture. Make sure workspace caches are chainloaded and the last in chain for an arch is saved. +# - save_cache: +# requires: +# - talos-2 +# - librem_14 # # Those onboarding new boards should add their entries below. @@ -265,210 +265,210 @@ workflows: # #Coreboot 4.22.01 boards - - build: - name: x220-hotp-maximized - target: x220-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x220-maximized - target: x220-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t420-hotp-maximized - target: t420-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t420-maximized - target: t420-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-legacy-flash - target: x230-legacy-flash - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-legacy - target: x230-legacy - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-hotp-legacy - target: x230-hotp-legacy - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-hotp-maximized_usb-kb - target: x230-hotp-maximized_usb-kb - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t430-hotp-maximized - target: t430-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-maximized - target: x230-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-maximized-fhd_edp - target: x230-maximized-fhd_edp - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: x230-hotp-maximized-fhd_edp - target: x230-hotp-maximized-fhd_edp - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: w530-hotp-maximized - target: w530-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t430-maximized - target: t430-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: w530-maximized - target: w530-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t440p-maximized - target: t440p-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: t440p-hotp-maximized - target: t440p-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: w541-maximized - target: w541-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: w541-hotp-maximized - target: w541-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: qemu-coreboot-fbwhiptail-tpm2-hotp - target: qemu-coreboot-fbwhiptail-tpm2-hotp - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: z220-cmt-maximized - target: z220-cmt-maximized - subcommand: "" - requires: - - x230-hotp-maximized - - - build: - name: z220-cmt-hotp-maximized - target: z220-cmt-hotp-maximized - subcommand: "" - requires: - - x230-hotp-maximized - -#coreboot-git librem boards - - build: - name: librem_13v2 - target: librem_13v2 - subcommand: "" - requires: - - librem_14 - - - build: - name: librem_15v3 - target: librem_15v3 - subcommand: "" - requires: - - librem_14 - - - build: - name: librem_13v4 - target: librem_13v4 - subcommand: "" - requires: - - librem_14 - - - build: - name: librem_15v4 - target: librem_15v4 - subcommand: "" - requires: - - librem_14 - - - build: - name: librem_mini - target: librem_mini - subcommand: "" - requires: - - librem_14 - - - build: - name: librem_mini_v2 - target: librem_mini_v2 - subcommand: "" - requires: - - librem_14 - -#coreboot-git dasharo clevo_release + staging IASL patch - - build: - name: nitropad-ns50 - target: nitropad-ns50 - subcommand: "" - requires: - - nitropad-nv41 +# - build: +# name: x220-hotp-maximized +# target: x220-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x220-maximized +# target: x220-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t420-hotp-maximized +# target: t420-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t420-maximized +# target: t420-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-legacy-flash +# target: x230-legacy-flash +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-legacy +# target: x230-legacy +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-hotp-legacy +# target: x230-hotp-legacy +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-hotp-maximized_usb-kb +# target: x230-hotp-maximized_usb-kb +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t430-hotp-maximized +# target: t430-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-maximized +# target: x230-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-maximized-fhd_edp +# target: x230-maximized-fhd_edp +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: x230-hotp-maximized-fhd_edp +# target: x230-hotp-maximized-fhd_edp +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: w530-hotp-maximized +# target: w530-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t430-maximized +# target: t430-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: w530-maximized +# target: w530-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t440p-maximized +# target: t440p-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: t440p-hotp-maximized +# target: t440p-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: w541-maximized +# target: w541-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: w541-hotp-maximized +# target: w541-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: qemu-coreboot-fbwhiptail-tpm2-hotp +# target: qemu-coreboot-fbwhiptail-tpm2-hotp +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: z220-cmt-maximized +# target: z220-cmt-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +# - build: +# name: z220-cmt-hotp-maximized +# target: z220-cmt-hotp-maximized +# subcommand: "" +# requires: +# - x230-hotp-maximized +# +##coreboot-git librem boards +# - build: +# name: librem_13v2 +# target: librem_13v2 +# subcommand: "" +# requires: +# - librem_14 +# +# - build: +# name: librem_15v3 +# target: librem_15v3 +# subcommand: "" +# requires: +# - librem_14 +# +# - build: +# name: librem_13v4 +# target: librem_13v4 +# subcommand: "" +# requires: +# - librem_14 +# +# - build: +# name: librem_15v4 +# target: librem_15v4 +# subcommand: "" +# requires: +# - librem_14 +# +# - build: +# name: librem_mini +# target: librem_mini +# subcommand: "" +# requires: +# - librem_14 +# +# - build: +# name: librem_mini_v2 +# target: librem_mini_v2 +# subcommand: "" +# requires: +# - librem_14 +# +##coreboot-git dasharo clevo_release + staging IASL patch +# - build: +# name: nitropad-ns50 +# target: nitropad-ns50 +# subcommand: "" +# requires: +# - nitropad-nv41 # - build: # name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard From 14d6894ac9df18c6c37b0d7c24b3cb38fc6d20a2 Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Sat, 6 Apr 2024 02:24:08 +0100 Subject: [PATCH 4/5] build `kgpe-d16_workstation` in ci Signed-off-by: Thomas Clarke --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09fcc6ab7..21097214f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -216,6 +216,14 @@ workflows: # version. The last board in the sequence is the dependency # for the parallel boards built at the end, and also save_cache. + - build_and_persist: + name: kgpe-d16_workstation + target: kgpe-d16_workstation + subcommand: "" + requires: + - prep_env + + # # coreboot 4.22.01 # - build_and_persist: # name: x230-hotp-maximized From 6642b2da1babae658912947c3e77654e22b736e6 Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Sat, 6 Apr 2024 02:24:33 +0100 Subject: [PATCH 5/5] add repo for `acpica-unix2-20210331.tar.gz` Signed-off-by: Thomas Clarke --- bin/fetch_coreboot_crossgcc_archive.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/fetch_coreboot_crossgcc_archive.sh b/bin/fetch_coreboot_crossgcc_archive.sh index 58ba0c467..18d508096 100755 --- a/bin/fetch_coreboot_crossgcc_archive.sh +++ b/bin/fetch_coreboot_crossgcc_archive.sh @@ -112,6 +112,10 @@ case "$PKG_NAME" in if [ "$PKG_BASENAME" = acpica-unix2-20220331.tar.gz ]; then PKG_BASEURL="https://downloadmirror.intel.com/774879/" fi + + if [ "$PKG_BASENAME" = acpica-unix2-20210331.tar.gz ]; then + PKG_BASEURL="https://ftp.gnu.org/gnu/gnuboot/mirrors/acpica.org/" + fi ;; esac