Skip to content

Commit 65abba9

Browse files
committed
coreboot-nitrokey: update dasharo to v1.7.2
* remove all previous coreboot patches (as they are already included) * to be investigated: linux trampoline patch * add new patch to hardcode sleep configuration * activate smmstore as dasharo vendor code requires it Signed-off-by: Markus Meissner <coder@safemailbox.de>
1 parent 25d7b06 commit 65abba9

9 files changed

+19
-423
lines changed

config/coreboot-nitropad-ns50.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
560560
# CONFIG_ELOG is not set
561561
CONFIG_CACHE_MRC_SETTINGS=y
562562
CONFIG_MRC_SETTINGS_PROTECT=y
563-
# CONFIG_SMMSTORE is not set
563+
CONFIG_SMMSTORE=y
564564
CONFIG_SPI_FLASH=y
565565
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
566566
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y

config/coreboot-nitropad-nv41.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
560560
# CONFIG_ELOG is not set
561561
CONFIG_CACHE_MRC_SETTINGS=y
562562
CONFIG_MRC_SETTINGS_PROTECT=y
563-
# CONFIG_SMMSTORE is not set
563+
CONFIG_SMMSTORE=y
564564
CONFIG_SPI_FLASH=y
565565
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
566566
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y

modules/coreboot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ $(eval $(call coreboot_module,purism,))
8888
#Nitrokey nv41/ns50 are based on Dasharo coreboot port,
8989
# with patches staging under coreboot-clevo_release
9090
coreboot-nitrokey_repo := https://github.com/dasharo/coreboot
91-
coreboot-nitrokey_commit_hash := ae10b20f5c6abc9c23f709b65c46be6525da8c13
91+
coreboot-nitrokey_commit_hash := 1bcb338682b612cfcca8bba02846f78139b2e0c8
9292
coreboot-nitrokey_patch_version := clevo_release
9393
#We use clevo_release's crossgcc for now, unshared but between nitropad nv41/ns50
9494
$(eval $(call coreboot_module,nitrokey,))

patches/coreboot-nitrokey-clevo_release/0001-change_acpica-unix2_location_to_a_mirror.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff -ur dasharo_cb.org/src/vendorcode/dasharo/options.c dasharo_cb/src/vendorcode/dasharo/options.c
2+
--- dasharo_cb.org/src/vendorcode/dasharo/options.c 2023-12-18 21:57:46.915582991 +0100
3+
+++ dasharo_cb/src/vendorcode/dasharo/options.c 2023-12-19 19:16:13.077019389 +0100
4+
@@ -189,7 +189,12 @@
5+
6+
uint8_t get_sleep_type_option(void)
7+
{
8+
+
9+
+#if CONFIG(BOARD_NOVACUSTOM_NV4X_ADLP)
10+
+ uint8_t sleep_type = SLEEP_TYPE_OPTION_S3;
11+
+#else
12+
uint8_t sleep_type = SLEEP_TYPE_OPTION_S0IX;
13+
+#endif
14+
15+
if (CONFIG(DRIVERS_EFI_VARIABLE_STORE))
16+
read_u8_var("SleepType", &sleep_type);

patches/coreboot-nitrokey-clevo_release/0002-libgfxinit-center_bootsplash_on_bigger_framebuffers.patch

Lines changed: 0 additions & 150 deletions
This file was deleted.

patches/coreboot-nitrokey-clevo_release/0002-s3-sleep-hardcode.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

patches/coreboot-nitrokey-clevo_release/0003-linux_trampoline-handle_coreboot_framebuffer.patch

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)