diff --git a/modules/coreboot b/modules/coreboot index 73b310fc..b4b73752 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -88,12 +88,9 @@ coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git coreboot-purism_commit_hash := 0d57cff58fba2f3a4d3a714a4eae65753e58c6ff $(eval $(call coreboot_module,purism,)) -#Nitrokey nv41/ns50 are based on Dasharo coreboot port, -# with patches staging under coreboot-clevo_release +#Nitrokey nv41/ns50 are based on Dasharo coreboot port coreboot-nitrokey_repo := https://github.com/dasharo/coreboot coreboot-nitrokey_commit_hash := a1787afa6b3bf4d3b201cfdbe2ef69623072afa5 -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,)) # Check that the board configured the coreboot version correctly diff --git a/patches/coreboot-nitrokey-clevo_release/0001-dasharo-hardcode-configurations.patch b/patches/coreboot-nitrokey-clevo_release/0001-dasharo-hardcode-configurations.patch deleted file mode 100644 index 5bc9754d..00000000 --- a/patches/coreboot-nitrokey-clevo_release/0001-dasharo-hardcode-configurations.patch +++ /dev/null @@ -1,16 +0,0 @@ -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); diff --git a/patches/coreboot-nitrokey-clevo_release/0002-dasharo-hardcode-me.patch b/patches/coreboot-nitrokey-clevo_release/0002-dasharo-hardcode-me.patch deleted file mode 100644 index cb4a7786..00000000 --- a/patches/coreboot-nitrokey-clevo_release/0002-dasharo-hardcode-me.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur coreboot-nitrokey.org/src/vendorcode/dasharo/options.c coreboot-nitrokey/src/vendorcode/dasharo/options.c ---- coreboot-nitrokey.org/src/vendorcode/dasharo/options.c 2024-01-22 14:11:59.525612567 +0100 -+++ coreboot-nitrokey/src/vendorcode/dasharo/options.c 2024-01-22 14:12:07.535544365 +0100 -@@ -133,7 +133,7 @@ - if (CONFIG(DRIVERS_EFI_VARIABLE_STORE)) - read_u8_var("MeMode", &var); - -- return var; -+ return ME_MODE_DISABLE_HAP; - } - - bool is_smm_bwp_permitted(void)