From 61843d890b52f056c3655c1e6c6197c1b127f63d Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 19 Dec 2023 13:05:46 -0500 Subject: [PATCH] Unify upstream board config defaults - Upstream boards will not deactivate TPM DUK - Upstream will not force BRAND_NAME which currently defaults to Heads - Upstream will not deactivate Qr code on screen output on HOTP sealing - Upstream will not offer OEM reset defaults (deprecated and now default anyway) Signed-off-by: Thierry Laurion --- .../UNTESTED_kgpe-d16_server-whiptail.config | 1 - .../UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config | 1 - .../UNTESTED_kgpe-d16_workstation-usb_keyboard.config | 1 - .../UNTESTED_kgpe-d16_workstation.config | 1 - boards/UNTESTED_leopard/UNTESTED_leopard.config | 1 - .../UNTESTED_p8z77-m_pro-tpm1-hotp-maximized.config | 1 - .../UNTESTED_p8z77-m_pro-tpm1-maximized.config | 1 - boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config | 1 - boards/UNTESTED_r630/UNTESTED_r630.config | 1 - boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config | 1 - .../UNTESTED_t420-hotp-maximized.config | 1 - boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config | 1 - boards/UNTESTED_t420/UNTESTED_t420.config | 1 - .../UNTESTED_t430-hotp-legacy.config | 1 - .../UNTESTED_t430-legacy-flash.config | 1 - boards/UNTESTED_t430-legacy/UNTESTED_t430-legacy.config | 1 - .../UNTESTED_t520-hotp-maximized.config | 1 - boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config | 1 - .../UNTESTED_t530-dgpu-hotp-maximized.config | 1 - .../UNTESTED_t530-dgpu-maximized.config | 1 - .../UNTESTED_t530-hotp-maximized.config | 1 - boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config | 1 - boards/UNTESTED_tioga/UNTESTED_tioga.config | 1 - .../UNTESTED_w530-dgpu-K1000m-hotp-maximized.config | 1 - .../UNTESTED_w530-dgpu-K1000m-maximized.config | 1 - .../UNTESTED_w530-dgpu-K2000m-hotp-maximized.config | 1 - .../UNTESTED_w530-dgpu-K2000m-maximized.config | 1 - .../UNTESTED_w530-hotp-maximized.config | 1 - boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config | 1 - boards/UNTESTED_winterfell/UNTESTED_winterfell.config | 1 - boards/UNTESTED_winterfell/uinit.go | 1 - boards/UNTESTED_x220/UNTESTED_x220.config | 1 - boards/librem_11/initrd/bin/board-init.sh | 1 - boards/librem_11/initrd/etc/librem_11.map | 1 - boards/librem_11/librem_11.config | 4 ---- boards/librem_13v2/librem_13v2.config | 3 --- boards/librem_13v4/librem_13v4.config | 3 --- boards/librem_14/librem_14.config | 3 --- boards/librem_15v3/librem_15v3.config | 3 --- boards/librem_15v4/librem_15v4.config | 3 --- boards/librem_l1um/librem_l1um.config | 3 --- boards/librem_l1um_v2/librem_l1um_v2.config | 3 --- boards/librem_mini/initrd/bin/board-init.sh | 1 - boards/librem_mini/initrd/bin/set_ec_poweron.sh | 1 - boards/librem_mini/librem_mini.config | 3 --- boards/librem_mini_v2/initrd/bin/board-init.sh | 1 - boards/librem_mini_v2/initrd/bin/set_ec_poweron.sh | 1 - boards/librem_mini_v2/librem_mini_v2.config | 3 --- boards/nitropad-ns50/nitropad-ns50.config | 2 -- boards/nitropad-nv41/nitropad-nv41.config | 2 -- .../qemu-coreboot-fbwhiptail-tpm1-hotp.config | 1 - .../qemu-coreboot-fbwhiptail-tpm1-hotp.md | 1 - .../qemu-coreboot-fbwhiptail-tpm1.config | 1 - .../qemu-coreboot-fbwhiptail-tpm2-hotp.config | 1 - .../qemu-coreboot-fbwhiptail-tpm2.config | 1 - .../qemu-coreboot-whiptail-tpm1-hotp.config | 1 - .../qemu-coreboot-whiptail-tpm1.config | 1 - .../qemu-coreboot-whiptail-tpm2-hotp.config | 1 - .../qemu-coreboot-whiptail-tpm2.config | 1 - boards/t430-hotp-maximized/t430-hotp-maximized.config | 1 - boards/t430-maximized/t430-maximized.config | 1 - boards/t440p-hotp-maximized/t440p-hotp-maximized.config | 1 - boards/t440p-maximized/t440p-maximized.config | 1 - boards/talos-2/talos-2.config | 1 - boards/w541-hotp-maximized/w541-hotp-maximized.config | 1 - boards/w541-maximized/w541-maximized.config | 1 - boards/x220-hotp-maximized/x220-hotp-maximized.config | 1 - boards/x220-maximized/x220-maximized.config | 1 - boards/x230-hotp-legacy/x230-hotp-legacy.config | 1 - .../x230-hotp-maximized-fhd_edp.config | 1 - boards/x230-hotp-maximized/x230-hotp-maximized.config | 1 - .../x230-hotp-maximized_usb-kb.config | 1 - boards/x230-legacy-flash/x230-legacy-flash.config | 1 - boards/x230-legacy/x230-legacy.config | 1 - boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config | 1 - boards/x230-maximized/x230-maximized.config | 1 - boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config | 1 - boards/z220-cmt-maximized/z220-cmt-maximized.config | 1 - 78 files changed, 101 deletions(-) diff --git a/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config b/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config index a52ef708..045ccf01 100644 --- a/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config +++ b/boards/UNTESTED_kgpe-d16_server-whiptail/UNTESTED_kgpe-d16_server-whiptail.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a kgpe-d16_server with whiptail, permitting usage of gui-init on console without FB graphic # per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads # diff --git a/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config b/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config index a19d4630..26a261ec 100644 --- a/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config +++ b/boards/UNTESTED_kgpe-d16_server/UNTESTED_kgpe-d16_server.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a kgpe-d16_server # per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads # diff --git a/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config b/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config index b7eebcf2..78b56ff4 100644 --- a/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config +++ b/boards/UNTESTED_kgpe-d16_workstation-usb_keyboard/UNTESTED_kgpe-d16_workstation-usb_keyboard.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a kgpe-d16_workstation-usb_keyboard # Linux configuration supporting Nvidia, AMD GPUs, enforcing post on nvidia. # Please make sure jumper forces external GPU diff --git a/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config b/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config index 16729b58..6cee65ca 100644 --- a/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config +++ b/boards/UNTESTED_kgpe-d16_workstation/UNTESTED_kgpe-d16_workstation.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a kgpe-d16_workstation # Linux configuration supporting Nvidia, AMD GPUs, enforcing post on nvidia. # Please make sure jumper forces external GPU diff --git a/boards/UNTESTED_leopard/UNTESTED_leopard.config b/boards/UNTESTED_leopard/UNTESTED_leopard.config index ef6c1893..fe9866ab 100644 --- a/boards/UNTESTED_leopard/UNTESTED_leopard.config +++ b/boards/UNTESTED_leopard/UNTESTED_leopard.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Leopard OCP node # and it uses LinuxBoot, not coreboot. CONFIG_LINUXBOOT=y diff --git a/boards/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized.config b/boards/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized.config index 4c38b110..a43fa33b 100644 --- a/boards/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized.config +++ b/boards/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized/UNTESTED_p8z77-m_pro-tpm1-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Inherit the rest from the base Asus P8Z77-M Pro config. include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config diff --git a/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config b/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config index 2d8908c1..2ac19976 100644 --- a/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config +++ b/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for Asus P8Z77-M Pro #This board is a better choice over the P8H61 for a cost effective Heads + QubesOS desktop with ME neuter+disable compatibility. #The P8H61 ecosystem was complex with multiple variants diff --git a/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config b/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config index f07f2ff3..c47edd57 100644 --- a/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config +++ b/boards/UNTESTED_qemu-linuxboot/UNTESTED_qemu-linuxboot.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for emulating LinuxBoot+Heads with qemu # export CONFIG_LINUXBOOT=y diff --git a/boards/UNTESTED_r630/UNTESTED_r630.config b/boards/UNTESTED_r630/UNTESTED_r630.config index 6589af9e..2f0ec38e 100644 --- a/boards/UNTESTED_r630/UNTESTED_r630.config +++ b/boards/UNTESTED_r630/UNTESTED_r630.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Dell R630 # flashrom doesn't work on this mainboard # and it is NERF, not coreboot. diff --git a/boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config b/boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config index 0db75823..591984b3 100644 --- a/boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config +++ b/boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Intel S2600wf server mainboard # and it is NERF, not coreboot. # diff --git a/boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config b/boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config index db0e4ac9..8a01df8a 100644 --- a/boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config +++ b/boards/UNTESTED_t420-hotp-maximized/UNTESTED_t420-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T420 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config b/boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config index 1b8ac52e..f9d9f628 100644 --- a/boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config +++ b/boards/UNTESTED_t420-maximized/UNTESTED_t420-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T420 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t420/UNTESTED_t420.config b/boards/UNTESTED_t420/UNTESTED_t420.config index 634fcf5f..db2917e0 100644 --- a/boards/UNTESTED_t420/UNTESTED_t420.config +++ b/boards/UNTESTED_t420/UNTESTED_t420.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # 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 diff --git a/boards/UNTESTED_t430-hotp-legacy/UNTESTED_t430-hotp-legacy.config b/boards/UNTESTED_t430-hotp-legacy/UNTESTED_t430-hotp-legacy.config index 28838d2b..00c4ecc6 100644 --- a/boards/UNTESTED_t430-hotp-legacy/UNTESTED_t430-hotp-legacy.config +++ b/boards/UNTESTED_t430-hotp-legacy/UNTESTED_t430-hotp-legacy.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a t430 with HOTP (Nitrokey/Purism USB Security dongle enabled HOTP support) # running Qubes 4.1 and other OSes. # diff --git a/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config b/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config index 44e939b2..b09fd7ef 100644 --- a/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config +++ b/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Minimal configuration for a t430 to support flashrom and USB # This top SPI flash image needed to flash legacy board counterpart internally # This image can be flashed through 1vyrain and skulls diff --git a/boards/UNTESTED_t430-legacy/UNTESTED_t430-legacy.config b/boards/UNTESTED_t430-legacy/UNTESTED_t430-legacy.config index 95716795..367b1573 100644 --- a/boards/UNTESTED_t430-legacy/UNTESTED_t430-legacy.config +++ b/boards/UNTESTED_t430-legacy/UNTESTED_t430-legacy.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a t430 running Qubes 4.1 and other OSes # STATIC_OPTION_TABLE is set inside of coreboot config # diff --git a/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config b/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config index 8f65c335..fc182f7c 100644 --- a/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config +++ b/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T520 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config b/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config index 5e170f24..590c8b5b 100644 --- a/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config +++ b/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T520 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config b/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config index df53a2bb..b231c8d4 100644 --- a/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config +++ b/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config b/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config index 18a6b985..e89c98f9 100644 --- a/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config +++ b/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config b/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config index 94c0485f..647fbc28 100644 --- a/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config +++ b/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config b/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config index 6a2bfeb7..b5890d2b 100644 --- a/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config +++ b/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_tioga/UNTESTED_tioga.config b/boards/UNTESTED_tioga/UNTESTED_tioga.config index dfe4e94a..7d72429b 100644 --- a/boards/UNTESTED_tioga/UNTESTED_tioga.config +++ b/boards/UNTESTED_tioga/UNTESTED_tioga.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Tioga Pass (Wiwynn) OCP node # and it uses LinuxBoot, not coreboot. CONFIG_LINUXBOOT=y diff --git a/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config index cf910eee..ca5cd972 100644 --- a/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config index e81b6ed4..7dfc6d82 100644 --- a/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config index ad54bbf9..e9a7ab8a 100644 --- a/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config index 66f85579..93cb8d99 100644 --- a/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config +++ b/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config b/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config index c337ab86..ec01b248 100644 --- a/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config +++ b/boards/UNTESTED_w530-hotp-maximized/UNTESTED_w530-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config b/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config index 61025597..b369d4d4 100644 --- a/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config +++ b/boards/UNTESTED_w530-maximized/UNTESTED_w530-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a W530 running Qubes and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/UNTESTED_winterfell/UNTESTED_winterfell.config b/boards/UNTESTED_winterfell/UNTESTED_winterfell.config index c7aff8f4..22e87dd5 100644 --- a/boards/UNTESTED_winterfell/UNTESTED_winterfell.config +++ b/boards/UNTESTED_winterfell/UNTESTED_winterfell.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Winterfell OCP node # and it uses LinuxBoot, not coreboot. CONFIG_LINUXBOOT=y diff --git a/boards/UNTESTED_winterfell/uinit.go b/boards/UNTESTED_winterfell/uinit.go index defeede9..bf1d0767 100644 --- a/boards/UNTESTED_winterfell/uinit.go +++ b/boards/UNTESTED_winterfell/uinit.go @@ -1,4 +1,3 @@ -BRAND_NAME=Heads // Copyright 2012-2017 the u-root Authors. All rights reserved // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. diff --git a/boards/UNTESTED_x220/UNTESTED_x220.config b/boards/UNTESTED_x220/UNTESTED_x220.config index 899147ee..cb1a6be5 100644 --- a/boards/UNTESTED_x220/UNTESTED_x220.config +++ b/boards/UNTESTED_x220/UNTESTED_x220.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a x220 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 diff --git a/boards/librem_11/initrd/bin/board-init.sh b/boards/librem_11/initrd/bin/board-init.sh index 602ac96f..0e999e09 100755 --- a/boards/librem_11/initrd/bin/board-init.sh +++ b/boards/librem_11/initrd/bin/board-init.sh @@ -1,4 +1,3 @@ -BRAND_NAME=Heads #! /bin/bash set -e -o pipefail loadkeys /etc/librem_11.map diff --git a/boards/librem_11/initrd/etc/librem_11.map b/boards/librem_11/initrd/etc/librem_11.map index eb918de6..78fbdc49 100644 --- a/boards/librem_11/initrd/etc/librem_11.map +++ b/boards/librem_11/initrd/etc/librem_11.map @@ -1,4 +1,3 @@ -BRAND_NAME=Heads keymaps 0-2,4-5,8,12 # Use volume and power keys on tablet to navigate menus keycode 114 = Up diff --git a/boards/librem_11/librem_11.config b/boards/librem_11/librem_11.config index 3ffcf2f1..07c8b8e4 100644 --- a/boards/librem_11/librem_11.config +++ b/boards/librem_11/librem_11.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for librem_11 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_11.config @@ -29,9 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=n -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n -export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/librem_13v2/librem_13v2.config b/boards/librem_13v2/librem_13v2.config index 1c1d916d..ad5365ed 100644 --- a/boards/librem_13v2/librem_13v2.config +++ b/boards/librem_13v2/librem_13v2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem_13v2 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config @@ -29,8 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n diff --git a/boards/librem_13v4/librem_13v4.config b/boards/librem_13v4/librem_13v4.config index 089c832d..ea7cff2c 100644 --- a/boards/librem_13v4/librem_13v4.config +++ b/boards/librem_13v4/librem_13v4.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem_13v4 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v4.config @@ -29,8 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n diff --git a/boards/librem_14/librem_14.config b/boards/librem_14/librem_14.config index 9004d111..609f6c09 100644 --- a/boards/librem_14/librem_14.config +++ b/boards/librem_14/librem_14.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem 14 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_14.config @@ -27,8 +26,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/librem_15v3/librem_15v3.config b/boards/librem_15v3/librem_15v3.config index 96c94242..5897323a 100644 --- a/boards/librem_15v3/librem_15v3.config +++ b/boards/librem_15v3/librem_15v3.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem_15v3 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config @@ -29,8 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n diff --git a/boards/librem_15v4/librem_15v4.config b/boards/librem_15v4/librem_15v4.config index 9e119db9..6b5889dc 100644 --- a/boards/librem_15v4/librem_15v4.config +++ b/boards/librem_15v4/librem_15v4.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem_15v4 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config @@ -30,8 +29,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n diff --git a/boards/librem_l1um/librem_l1um.config b/boards/librem_l1um/librem_l1um.config index 3f12a383..0a670fef 100644 --- a/boards/librem_l1um/librem_l1um.config +++ b/boards/librem_l1um/librem_l1um.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem_l1um CONFIG_LINUX_CONFIG=config/linux-librem_common.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_l1um.config @@ -28,8 +27,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/librem_l1um_v2/librem_l1um_v2.config b/boards/librem_l1um_v2/librem_l1um_v2.config index dff692f9..a02c69b5 100644 --- a/boards/librem_l1um_v2/librem_l1um_v2.config +++ b/boards/librem_l1um_v2/librem_l1um_v2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for librem_l1um_v2 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_l1um_v2.config @@ -31,8 +30,6 @@ export CONFIG_TPM2_TOOLS=y CONFIG_TPM2_TSS=y CONFIG_OPENSSL=y CONFIG_PRIMARY_KEY_TYPE=ecc -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/librem_mini/initrd/bin/board-init.sh b/boards/librem_mini/initrd/bin/board-init.sh index 851cb946..4299016c 100755 --- a/boards/librem_mini/initrd/bin/board-init.sh +++ b/boards/librem_mini/initrd/bin/board-init.sh @@ -1,4 +1,3 @@ -BRAND_NAME=Heads #!/bin/bash set -o pipefail diff --git a/boards/librem_mini/initrd/bin/set_ec_poweron.sh b/boards/librem_mini/initrd/bin/set_ec_poweron.sh index 8ee1040e..9e145edc 100755 --- a/boards/librem_mini/initrd/bin/set_ec_poweron.sh +++ b/boards/librem_mini/initrd/bin/set_ec_poweron.sh @@ -1,4 +1,3 @@ -BRAND_NAME=Heads #!/bin/bash # Set the EC BRAM setting for automatic power-on. diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index f5641404..11f1b145 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem mini CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config @@ -29,8 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=n -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/librem_mini_v2/initrd/bin/board-init.sh b/boards/librem_mini_v2/initrd/bin/board-init.sh index 851cb946..4299016c 100755 --- a/boards/librem_mini_v2/initrd/bin/board-init.sh +++ b/boards/librem_mini_v2/initrd/bin/board-init.sh @@ -1,4 +1,3 @@ -BRAND_NAME=Heads #!/bin/bash set -o pipefail diff --git a/boards/librem_mini_v2/initrd/bin/set_ec_poweron.sh b/boards/librem_mini_v2/initrd/bin/set_ec_poweron.sh index 8ee1040e..9e145edc 100755 --- a/boards/librem_mini_v2/initrd/bin/set_ec_poweron.sh +++ b/boards/librem_mini_v2/initrd/bin/set_ec_poweron.sh @@ -1,4 +1,3 @@ -BRAND_NAME=Heads #!/bin/bash # Set the EC BRAM setting for automatic power-on. diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config index c148324b..39fa1ff3 100644 --- a/boards/librem_mini_v2/librem_mini_v2.config +++ b/boards/librem_mini_v2/librem_mini_v2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a librem mini v2 CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini_v2.config @@ -29,8 +28,6 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y export CONFIG_TPM=n -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n -export CONFIG_TOTP_SKIP_QRCODE=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config index 5254f5a9..9ebfc9cb 100644 --- a/boards/nitropad-ns50/nitropad-ns50.config +++ b/boards/nitropad-ns50/nitropad-ns50.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Nitrokey Nitropad NS51 board configuration export CONFIG_COREBOOT=y @@ -48,7 +47,6 @@ export CONFIG_PRIMARY_KEY_TYPE=ecc CONFIG_TPM2_TSS=y CONFIG_OPENSSL=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n export CONFIG_BOOT_DEV="/dev/nvme0n1" export CONFIG_BOARD_NAME="Nitropad NS50" diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index 815a0221..7547ba62 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Nitrokey Nitropad NV41 board configuration export CONFIG_COREBOOT=y @@ -48,7 +47,6 @@ export CONFIG_PRIMARY_KEY_TYPE=ecc CONFIG_TPM2_TSS=y CONFIG_OPENSSL=y -export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=n export CONFIG_BOOT_DEV="/dev/nvme0n1" export CONFIG_BOARD_NAME="Nitropad NV41" diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config index e673f832..f710d2fc 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md index fde1d775..0dfdd63e 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md +++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.md @@ -1,4 +1,3 @@ -BRAND_NAME=Heads qemu-coreboot-(fb)whiptail-tpm[1,2](-hotp) boards === diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config index 478c9a84..7dc4ea91 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config index 682d47c7..b9eec341 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in graphical mode thanks to FBWhiptail # This version requires a supported HOTP Security dongle (Nitrokey Pro/Storage or Librem Key) diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config index e8c91325..c286f1a4 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in graphical mode thanks to FBWhiptail # diff --git a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config index 86509e1d..0c568ff2 100644 --- a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config index f4ef18f1..e03dc06f 100644 --- a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config +++ b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config index e42be46f..999f8a55 100644 --- a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # This version requires a supported HOTP Security dongle (Nitrokey Pro/Storage or Librem Key) diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config index bad66122..ea6f3d36 100644 --- a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config +++ b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for building a coreboot ROM that works in # the qemu emulator in console mode thanks to Whiptail # diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config index 16eedb7c..749de960 100644 --- a/boards/t430-hotp-maximized/t430-hotp-maximized.config +++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T430 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config index e1956eea..3a5d3516 100644 --- a/boards/t430-maximized/t430-maximized.config +++ b/boards/t430-maximized/t430-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a T430 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/t440p-hotp-maximized/t440p-hotp-maximized.config b/boards/t440p-hotp-maximized/t440p-hotp-maximized.config index 707911fb..1d48c5cb 100644 --- a/boards/t440p-hotp-maximized/t440p-hotp-maximized.config +++ b/boards/t440p-hotp-maximized/t440p-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Inherit the rest from the base T440p config. include $(pwd)/boards/t440p-maximized/t440p-maximized.config diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config index cf95db2d..2f94b882 100644 --- a/boards/t440p-maximized/t440p-maximized.config +++ b/boards/t440p-maximized/t440p-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a ThinkPad T440p. CONFIG_COREBOOT_CONFIG=config/coreboot-t440p.config # TODO: Make a ThinkPad-common Linux config file. diff --git a/boards/talos-2/talos-2.config b/boards/talos-2/talos-2.config index 6a99df12..7de53584 100644 --- a/boards/talos-2/talos-2.config +++ b/boards/talos-2/talos-2.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a Talos 2 running Qubes and other OSes # The board uses BE coreboot and LE Linux kernel and initrd CONFIG_TARGET_ARCH=ppc64 diff --git a/boards/w541-hotp-maximized/w541-hotp-maximized.config b/boards/w541-hotp-maximized/w541-hotp-maximized.config index 42f2b0f6..a73be700 100644 --- a/boards/w541-hotp-maximized/w541-hotp-maximized.config +++ b/boards/w541-hotp-maximized/w541-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Inherit the rest from the base W541 config. include $(pwd)/boards/w541-maximized/w541-maximized.config diff --git a/boards/w541-maximized/w541-maximized.config b/boards/w541-maximized/w541-maximized.config index 412efedb..a3c1a50f 100644 --- a/boards/w541-maximized/w541-maximized.config +++ b/boards/w541-maximized/w541-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a ThinkPad W541. CONFIG_COREBOOT_CONFIG=config/coreboot-w541.config # TODO: Make a ThinkPad-common Linux config file. diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config index e9306c52..28197056 100644 --- a/boards/x220-hotp-maximized/x220-hotp-maximized.config +++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X220 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config index e76bd77e..6e718a0d 100644 --- a/boards/x220-maximized/x220-maximized.config +++ b/boards/x220-maximized/x220-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X220 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/x230-hotp-legacy/x230-hotp-legacy.config b/boards/x230-hotp-legacy/x230-hotp-legacy.config index f4c3b3c6..ee9d2921 100644 --- a/boards/x230-hotp-legacy/x230-hotp-legacy.config +++ b/boards/x230-hotp-legacy/x230-hotp-legacy.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a x230 with HOTP (Nitrokey/Purism USB Security dongle enabled HOTP support) # running Qubes 4.1 and other OSes. # diff --git a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config index 9f03e97d..cef25df1 100644 --- a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config +++ b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Based on https://review.coreboot.org/c/coreboot/+/28950 for FHD mod diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index 235b0a07..acc0dd59 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config index b568f87d..07acf58d 100644 --- a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config +++ b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config index ffdbd66a..8e3ccecf 100644 --- a/boards/x230-legacy-flash/x230-legacy-flash.config +++ b/boards/x230-legacy-flash/x230-legacy-flash.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Minimal configuration for a x230 to support flashrom and USB # This top SPI flash image needed to flash legacy board counterpart internally # This image can be flashed through 1vyrain and skulls diff --git a/boards/x230-legacy/x230-legacy.config b/boards/x230-legacy/x230-legacy.config index 0c5d2686..cc877284 100644 --- a/boards/x230-legacy/x230-legacy.config +++ b/boards/x230-legacy/x230-legacy.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Deactivated to fit in coreboot's CONFIG_CBFS_SIZE=0x700000 : diff --git a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config index 87f00505..07ac10cc 100644 --- a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config +++ b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Based on https://review.coreboot.org/c/coreboot/+/28950 for FHD mod diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config index 85c54199..47dc1b84 100644 --- a/boards/x230-maximized/x230-maximized.config +++ b/boards/x230-maximized/x230-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes diff --git a/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config b/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config index 182b0bef..a434f3fd 100644 --- a/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config +++ b/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Inherit the rest from the base Z220 CMT config. include $(pwd)/boards/z220-cmt-maximized/z220-cmt-maximized.config diff --git a/boards/z220-cmt-maximized/z220-cmt-maximized.config b/boards/z220-cmt-maximized/z220-cmt-maximized.config index 373b21af..6a62f851 100644 --- a/boards/z220-cmt-maximized/z220-cmt-maximized.config +++ b/boards/z220-cmt-maximized/z220-cmt-maximized.config @@ -1,4 +1,3 @@ -BRAND_NAME=Heads # Configuration for HP Z220 CMT # #The board supports Intel LGA1155, which allows for ME removal (both neuter+disable as claimed by me_cleaner),