Skip to content

Commit ab97b24

Browse files
JonathonHall-PurismJonathonHall-Purism
committed
Merge remote-tracking branch 'github-heads/master' into site-local-config
2 parents 0cb6d91 + fa2d4e8 commit ab97b24

21 files changed

+6843
-35
lines changed

‎boards/librem_11/librem_11.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=n
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
33-
export CONFIG_OEMRESET_OFFER_DEFAULTS=y
3431

3532
export CONFIG_BOOTSCRIPT=/bin/gui-init
3633
export CONFIG_BOOT_REQ_HASH=n

‎boards/librem_13v2/librem_13v2.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=y
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
3331
export CONFIG_BOOTSCRIPT=/bin/gui-init
3432
export CONFIG_BOOT_REQ_HASH=n
3533
export CONFIG_BOOT_REQ_ROLLBACK=n

‎boards/librem_13v4/librem_13v4.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=y
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
3331
export CONFIG_BOOTSCRIPT=/bin/gui-init
3432
export CONFIG_BOOT_REQ_HASH=n
3533
export CONFIG_BOOT_REQ_ROLLBACK=n

‎boards/librem_14/librem_14.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ CONFIG_HOTPKEY=y
2626
CONFIG_LINUX_USB=y
2727

2828
export CONFIG_TPM=y
29-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
30-
export CONFIG_TOTP_SKIP_QRCODE=y
3129

3230
export CONFIG_BOOTSCRIPT=/bin/gui-init
3331
export CONFIG_BOOT_REQ_HASH=n

‎boards/librem_15v3/librem_15v3.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=y
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
3331
export CONFIG_BOOTSCRIPT=/bin/gui-init
3432
export CONFIG_BOOT_REQ_HASH=n
3533
export CONFIG_BOOT_REQ_ROLLBACK=n

‎boards/librem_15v4/librem_15v4.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ CONFIG_HOTPKEY=y
2929
CONFIG_LINUX_USB=y
3030

3131
export CONFIG_TPM=y
32-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
33-
export CONFIG_TOTP_SKIP_QRCODE=y
3432
export CONFIG_BOOTSCRIPT=/bin/gui-init
3533
export CONFIG_BOOT_REQ_HASH=n
3634
export CONFIG_BOOT_REQ_ROLLBACK=n

‎boards/librem_l1um/librem_l1um.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ CONFIG_HOTPKEY=y
2727
CONFIG_LINUX_USB=y
2828

2929
export CONFIG_TPM=y
30-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
31-
export CONFIG_TOTP_SKIP_QRCODE=y
3230

3331
export CONFIG_BOOTSCRIPT=/bin/gui-init
3432
export CONFIG_BOOT_REQ_HASH=n

‎boards/librem_l1um_v2/librem_l1um_v2.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ export CONFIG_TPM2_TOOLS=y
3030
CONFIG_TPM2_TSS=y
3131
CONFIG_OPENSSL=y
3232
CONFIG_PRIMARY_KEY_TYPE=ecc
33-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
34-
export CONFIG_TOTP_SKIP_QRCODE=y
3533

3634
export CONFIG_BOOTSCRIPT=/bin/gui-init
3735
export CONFIG_BOOT_REQ_HASH=n

‎boards/librem_mini/librem_mini.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=n
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
3331

3432
export CONFIG_BOOTSCRIPT=/bin/gui-init
3533
export CONFIG_BOOT_REQ_HASH=n

‎boards/librem_mini_v2/librem_mini_v2.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ CONFIG_HOTPKEY=y
2828
CONFIG_LINUX_USB=y
2929

3030
export CONFIG_TPM=n
31-
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
32-
export CONFIG_TOTP_SKIP_QRCODE=y
3331

3432
export CONFIG_BOOTSCRIPT=/bin/gui-init
3533
export CONFIG_BOOT_REQ_HASH=n

0 commit comments

Comments
 (0)