Merge pull request #1554 from tlaurion/ease_rebranding

tlaurion · web-flow · commit fa2d4e8c87bf · 2023-12-19T18:32:57.000Z
WiP: Ease cohesion of Heads expected features and rebranding
diff --git a/boards/librem_11/librem_11.config b/boards/librem_11/librem_11.config
@@ -28,9 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=n
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
-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
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 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
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 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
@@ -26,8 +26,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 
 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
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 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
@@ -29,8 +29,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 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
@@ -27,8 +27,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=y
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 
 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
@@ -30,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=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 
 export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=n
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 
 export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
 CONFIG_LINUX_USB=y
 
 export CONFIG_TPM=n
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
-export CONFIG_TOTP_SKIP_QRCODE=y
 
 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
@@ -47,7 +47,6 @@ export CONFIG_PRIMARY_KEY_TYPE=ecc
 CONFIG_TPM2_TSS=y
 CONFIG_OPENSSL=y
 
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
 
 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
@@ -47,7 +47,6 @@ export CONFIG_PRIMARY_KEY_TYPE=ecc
 CONFIG_TPM2_TSS=y
 CONFIG_OPENSSL=y
 
-export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
 
 export CONFIG_BOOT_DEV="/dev/nvme0n1"
 export CONFIG_BOARD_NAME="Nitropad NV41"
