Merge pull request #1561 from Nitrokey/up-v2.4

Bump Dasharo Coreboot / hotp-verification; fix nitropad-nxx ec-powerdown

Author: tlaurion

config/coreboot-nitropad-ns50.config

@@ -560,7 +560,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_ELOG is not set
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
-# CONFIG_SMMSTORE is not set
+CONFIG_SMMSTORE=y
 CONFIG_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y

config/coreboot-nitropad-nv41.config

@@ -560,7 +560,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_ELOG is not set
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
-# CONFIG_SMMSTORE is not set
+CONFIG_SMMSTORE=y
 CONFIG_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y

initrd/bin/poweroff

@@ -9,7 +9,7 @@ if [ "$CONFIG_TPM" = "y" ]; then
 fi
 
 # Run special EC-based poweroff for Nitropad-Nxx
-if [ "${CONFIG_BOARD%_*}" = nitropad-nv41 || "${CONFIG_BOARD%_*}" = nitropad-ns51 ]; then
+if [ "$CONFIG_BOARD" = "nitropad-nv41" ] || [ "$CONFIG_BOARD" = "nitropad-ns50" ]; then
 	/bin/nitropad-shutdown.sh
 fi
 

initrd/bin/reboot

@@ -18,7 +18,7 @@ if [ "$CONFIG_TPM" = "y" ]; then
 fi
 
 # Run special EC-based poweroff for Nitropad-Nxx
-if [ "${CONFIG_BOARD%_*}" = nitropad-nv41 ] || [ "${CONFIG_BOARD%_*}" = nitropad-ns51 ]; then
+if [ "$CONFIG_BOARD" = "nitropad-nv41" ] || [ "$CONFIG_BOARD" = "nitropad-ns50" ]; then
     /bin/nitropad-shutdown.sh
 fi
 

modules/coreboot

@@ -88,7 +88,7 @@ $(eval $(call coreboot_module,purism,))
 #Nitrokey nv41/ns50 are based on Dasharo coreboot port,
 # with patches staging under coreboot-clevo_release
 coreboot-nitrokey_repo := https://github.com/dasharo/coreboot
-coreboot-nitrokey_commit_hash := ae10b20f5c6abc9c23f709b65c46be6525da8c13
+coreboot-nitrokey_commit_hash := 1bcb338682b612cfcca8bba02846f78139b2e0c8
 coreboot-nitrokey_patch_version := clevo_release
 #We use clevo_release's crossgcc for now, unshared but between nitropad nv41/ns50
 $(eval $(call coreboot_module,nitrokey,))

modules/hotp-verification

@@ -2,12 +2,12 @@ modules-$(CONFIG_HOTPKEY) += hotp-verification
 
 hotp-verification_depends := libusb $(musl_dep)
 
-# v1.4
-hotp-verification_version := b69bb20119d3cea5ec5c13d11b213dd80dfd8334
+# v1.5
+hotp-verification_version := 70c04f51387eee8f777e943ba83b6405764a3cd2
 hotp-verification_dir := hotp-verification-$(hotp-verification_version)
 hotp-verification_tar := nitrokey-hotp-verification-$(hotp-verification_version).tar.gz
 hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(hotp-verification_version).tar.gz
-hotp-verification_hash := ee6bcb7fc48bd5e7c290b2b344ce50713f4199425b1a6b324d0b27c80257241d
+hotp-verification_hash := 5244b6b514117f955a03be2363fd51567a125cb8dc904d1bd89351be27eb8bb3
 
 hotp-verification_target := \
 	$(MAKE_JOBS) \

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

@@ -0,0 +1,16 @@
+diff -ur dasharo_cb.org/src/vendorcode/dasharo/options.c dasharo_cb/src/vendorcode/dasharo/options.c
+--- dasharo_cb.org/src/vendorcode/dasharo/options.c	2023-12-18 21:57:46.915582991 +0100
++++ dasharo_cb/src/vendorcode/dasharo/options.c	2023-12-19 19:16:13.077019389 +0100
+@@ -189,7 +189,12 @@
+ 
+ uint8_t get_sleep_type_option(void)
+ {
++
++#if CONFIG(BOARD_NOVACUSTOM_NV4X_ADLP)
++	uint8_t sleep_type = SLEEP_TYPE_OPTION_S3;
++#else
+ 	uint8_t sleep_type = SLEEP_TYPE_OPTION_S0IX;
++#endif
+ 
+ 	if (CONFIG(DRIVERS_EFI_VARIABLE_STORE))
+ 		read_u8_var("SleepType", &sleep_type);