Unify upstream board config defaults

tlaurion · tlaurion · commit 61843d890b52 · 2023-12-19T13:05:46.000-05:00
- 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 &lt;insurgo@riseup.net&gt;
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
diff --git a/boards/t440p-hotp-maximized/t440p-hotp-maximized.config b/boards/t440p-hotp-maximized/t440p-hotp-maximized.config
diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config
diff --git a/boards/talos-2/talos-2.config b/boards/talos-2/talos-2.config
diff --git a/boards/w541-hotp-maximized/w541-hotp-maximized.config b/boards/w541-hotp-maximized/w541-hotp-maximized.config
diff --git a/boards/w541-maximized/w541-maximized.config b/boards/w541-maximized/w541-maximized.config
diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config
diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config
diff --git a/boards/x230-hotp-legacy/x230-hotp-legacy.config b/boards/x230-hotp-legacy/x230-hotp-legacy.config
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
diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
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
diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config
diff --git a/boards/x230-legacy/x230-legacy.config b/boards/x230-legacy/x230-legacy.config
diff --git a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
diff --git a/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config b/boards/z220-cmt-hotp-maximized/z220-cmt-hotp-maximized.config
diff --git a/boards/z220-cmt-maximized/z220-cmt-maximized.config b/boards/z220-cmt-maximized/z220-cmt-maximized.config

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a kgpe-d16_server with whiptail, permitting usage of gui-init on console without FB graphic`
`3`	`2`	`# per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads`
`4`	`3`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a kgpe-d16_server`
`3`	`2`	`# per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads`
`4`	`3`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a kgpe-d16_workstation-usb_keyboard`
`3`	`2`	`# Linux configuration supporting Nvidia, AMD GPUs, enforcing post on nvidia.`
`4`	`3`	`# Please make sure jumper forces external GPU`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a Leopard OCP node`
`3`	`2`	`# and it uses LinuxBoot, not coreboot.`
`4`	`3`	`CONFIG_LINUXBOOT=y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Inherit the rest from the base Asus P8Z77-M Pro config.`
`3`	`2`	`include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for Asus P8Z77-M Pro`
`3`	`2`	`#This board is a better choice over the P8H61 for a cost effective Heads + QubesOS desktop with ME neuter+disable compatibility.`
`4`	`3`	`#The P8H61 ecosystem was complex with multiple variants`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for emulating LinuxBoot+Heads with qemu`
`3`	`2`	`#`
`4`	`3`	`export CONFIG_LINUXBOOT=y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a Dell R630`
`3`	`2`	`# flashrom doesn't work on this mainboard`
`4`	`3`	`# and it is NERF, not coreboot.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-BRAND_NAME=Heads`
`2`	`1`	`# Configuration for a Intel S2600wf server mainboard`
`3`	`2`	`# and it is NERF, not coreboot.`
`4`	`3`	`#`