From 6a64144e97286482b69dc21a25e03e986998bcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Tue, 6 Feb 2024 17:01:35 +0100 Subject: [PATCH 01/16] modules/coreboot,config/coreboot-nitropad: Update to the newest revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- config/coreboot-nitropad-ns50.config | 10 ++++++++-- config/coreboot-nitropad-nv41.config | 10 ++++++++-- modules/coreboot | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/config/coreboot-nitropad-ns50.config b/config/coreboot-nitropad-ns50.config index a6e90d95..1b545754 100644 --- a/config/coreboot-nitropad-ns50.config +++ b/config/coreboot-nitropad-ns50.config @@ -159,8 +159,8 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_DRIVERS_INTEL_WIFI=y -CONFIG_IFD_BIN_PATH="../nitrokey-blobs/nitropad-ns51/flashdescriptor-HAP.bin" -CONFIG_ME_BIN_PATH="../nitrokey-blobs/nitropad-ns51/me.bin" +CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/descriptor.bin" +CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=9 CONFIG_CARDBUS_PLUGIN_SUPPORT=y @@ -508,9 +508,15 @@ CONFIG_EC_SYSTEM76_EC=y # # Intel Firmware # +CONFIG_IFDTOOL_DISABLE_ME=y CONFIG_HAVE_ME_BIN=y # CONFIG_STITCH_ME_BIN is not set # CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set +CONFIG_HAVE_INTEL_ME_HAP=y +# CONFIG_INTEL_ME_DISABLED_HECI is not set +CONFIG_INTEL_ME_DISABLED_HAP=y +# CONFIG_INTEL_ME_ENABLED is not set +CONFIG_INTEL_ME_DEFAULT_STATE=2 # CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set # CONFIG_LOCK_MANAGEMENT_ENGINE is not set CONFIG_UNLOCK_FLASH_REGIONS=y diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index 5de5c478..cdbe1392 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -159,8 +159,8 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_DRIVERS_INTEL_WIFI=y -CONFIG_IFD_BIN_PATH="../nitrokey-blobs/nitropad-nv41/flashdescriptor-HAP.bin" -CONFIG_ME_BIN_PATH="../nitrokey-blobs/nitropad-nv41/me.bin" +CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_adl/descriptor.bin" +CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_adl/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=9 CONFIG_CARDBUS_PLUGIN_SUPPORT=y @@ -509,9 +509,15 @@ CONFIG_EC_SYSTEM76_EC_DGPU=y # # Intel Firmware # +CONFIG_IFDTOOL_DISABLE_ME=y CONFIG_HAVE_ME_BIN=y # CONFIG_STITCH_ME_BIN is not set # CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set +CONFIG_HAVE_INTEL_ME_HAP=y +# CONFIG_INTEL_ME_DISABLED_HECI is not set +CONFIG_INTEL_ME_DISABLED_HAP=y +# CONFIG_INTEL_ME_ENABLED is not set +CONFIG_INTEL_ME_DEFAULT_STATE=2 # CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set # CONFIG_LOCK_MANAGEMENT_ENGINE is not set CONFIG_UNLOCK_FLASH_REGIONS=y diff --git a/modules/coreboot b/modules/coreboot index 718508e6..0715d06b 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -91,7 +91,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 := 1bcb338682b612cfcca8bba02846f78139b2e0c8 +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,)) From 8e7e18920d34c024b4ae4f5633010596575f3be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Tue, 6 Feb 2024 17:01:56 +0100 Subject: [PATCH 02/16] modules/nitrokey-blobs,boards/nitropad: Remove obsolete blobs module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- boards/nitropad-ns50/nitropad-ns50.config | 3 --- boards/nitropad-nv41/nitropad-nv41.config | 3 --- modules/coreboot | 1 - modules/nitrokey-blobs | 12 ------------ 4 files changed, 19 deletions(-) delete mode 100644 modules/nitrokey-blobs diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config index 8a165060..29428dc6 100644 --- a/boards/nitropad-ns50/nitropad-ns50.config +++ b/boards/nitropad-ns50/nitropad-ns50.config @@ -7,9 +7,6 @@ export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-ns50.config CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config -#Enable blobs packed under coreboot at build time -CONFIG_NITROKEY_BLOBS=y - #Enable DEBUG output #export CONFIG_DEBUG_OUTPUT=y #export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index 3a6d157c..b1e96dbc 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -7,9 +7,6 @@ export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-nv41.config CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config -#Enable blobs packed under coreboot at build time -CONFIG_NITROKEY_BLOBS=y - #Enable DEBUG output #export CONFIG_DEBUG_OUTPUT=y #export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y diff --git a/modules/coreboot b/modules/coreboot index 0715d06b..73b310fc 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -110,7 +110,6 @@ coreboot_dir := $($(coreboot_module)_dir) coreboot_base_dir := $($(coreboot_module)_base_dir) $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) -$(coreboot_module)_depends += $(if $(CONFIG_NITROKEY_BLOBS), nitrokey-blobs) # coreboot builds are specialized on a per-target basis. # The builds are done in a per-target subdirectory diff --git a/modules/nitrokey-blobs b/modules/nitrokey-blobs deleted file mode 100644 index eafef400..00000000 --- a/modules/nitrokey-blobs +++ /dev/null @@ -1,12 +0,0 @@ -modules-$(CONFIG_NITROKEY_BLOBS) += nitrokey-blobs - -nitrokey-blobs_base_dir := nitrokey-blobs -nitrokey-blobs_version := b629bad31046ff2f5f363656326646fe2081d033 -nitrokey-blobs_tar := nitrokey-blobs-${nitrokey-blobs_version}.tar.gz -nitrokey-blobs_tar_opt := --strip 1 -nitrokey-blobs_url := https://github.com/Nitrokey/firmware-blobs/archive/${nitrokey-blobs_version}.tar.gz -nitrokey-blobs_hash := 73daf2180e3ffd070e9dc80c84ccd2573a24f636dc273e3d9fe81aefc7c5d425 - -## there is nothing to be built -nitrokey-blobs_output := .built -nitrokey-blobs_configure := echo -e 'all:\n\ttouch .built' > Makefile From c7dc6a8064ce0ec85fa5e4224423b1afecf01463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Tue, 6 Feb 2024 17:33:52 +0100 Subject: [PATCH 03/16] patches: Remove obsolete patches for nitropad builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- modules/coreboot | 5 +---- .../0001-dasharo-hardcode-configurations.patch | 16 ---------------- .../0002-dasharo-hardcode-me.patch | 12 ------------ 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 patches/coreboot-nitrokey-clevo_release/0001-dasharo-hardcode-configurations.patch delete mode 100644 patches/coreboot-nitrokey-clevo_release/0002-dasharo-hardcode-me.patch 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) From acc8044766334757543772ce9516ea0523d873b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Fri, 9 Feb 2024 10:50:33 +0100 Subject: [PATCH 04/16] modules/coreboot: Allow overriding LOCALVERSION and SMBIOS_PRODUCT_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- modules/coreboot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/coreboot b/modules/coreboot index b4b73752..7967696a 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -111,6 +111,8 @@ $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) # coreboot builds are specialized on a per-target basis. # The builds are done in a per-target subdirectory CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config +CONFIG_COREBOOT_LOCALVERSION ?= $(BRAND_NAME)-$(HEADS_GIT_VERSION) +CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD) # Ensure that touching the config file will force a rebuild $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG) @@ -135,8 +137,8 @@ endif $(coreboot_module)_configure := \ mkdir -p "$(build)/$(coreboot_dir)" \ && $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config) \ - && echo 'CONFIG_LOCALVERSION="$(BRAND_NAME)-$(HEADS_GIT_VERSION)"' >> $(build)/$(coreboot_dir)/.config \ - && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(BOARD)"' >> $(build)/$(coreboot_dir)/.config \ + && echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config \ + && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config \ && $(MAKE) olddefconfig \ -C "$(build)/$(coreboot_base_dir)" \ obj="$(build)/$(coreboot_dir)" \ From 3102666c91c985cdca3482eac6bb1a8daf5607d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Mon, 12 Feb 2024 18:19:20 +0100 Subject: [PATCH 05/16] coreboot-nitropad-nv41.config: disable RESOURCE_ALLOCATION_TOP_DOWN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also disable bootsplash resizing to center the logo in the middle of the screen. Signed-off-by: Michał Kopeć Signed-off-by: Thierry Laurion --- config/coreboot-nitropad-nv41.config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index cdbe1392..3cea462c 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -39,8 +39,7 @@ CONFIG_BOOTSPLASH_IMAGE=y CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=90 -CONFIG_BOOTSPLASH_CONVERT_RESIZE=y -CONFIG_BOOTSPLASH_CONVERT_RESOLUTION="1920x1080" +# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set # CONFIG_BOOTSPLASH_CONVERT_COLORSWAP is not set # CONFIG_FW_CONFIG is not set @@ -593,7 +592,7 @@ CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y # CONFIG_SOFTWARE_I2C is not set CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 -CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y +# CONFIG_RESOURCE_ALLOCATION_TOP_DOWN is not set # end of Devices # From 3cfa4e91aed9dcabbedbcec85be3fc1535a9ebaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Tue, 13 Feb 2024 15:21:49 +0100 Subject: [PATCH 06/16] Allow overriding DMI manufacturer name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Kopeć Signed-off-by: Thierry Laurion --- modules/coreboot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/coreboot b/modules/coreboot index 7967696a..21579c7f 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -98,7 +98,7 @@ ifeq "$(CONFIG_COREBOOT_VERSION)" "" $(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION") else ifeq "$(coreboot-$(CONFIG_COREBOOT_VERSION)_dir)" "" $(error "$(BOARD): coreboot version $(CONFIG_COREBOOT_VERSION) not known") -endif +endif coreboot_module := coreboot-$(CONFIG_COREBOOT_VERSION) modules-y += $(coreboot_module) @@ -113,6 +113,7 @@ $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config CONFIG_COREBOOT_LOCALVERSION ?= $(BRAND_NAME)-$(HEADS_GIT_VERSION) CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD) +CONFIG_COREBOOT_SMBIOS_MANUFACTURER ?= $(BRAND_NAME) # Ensure that touching the config file will force a rebuild $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG) @@ -139,6 +140,7 @@ $(coreboot_module)_configure := \ && $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config) \ && echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config \ && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config \ + && echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config \ && $(MAKE) olddefconfig \ -C "$(build)/$(coreboot_base_dir)" \ obj="$(build)/$(coreboot_dir)" \ @@ -247,7 +249,7 @@ coreboot.save_in_defconfig_format_in_place: DOTCONFIG="$(build)/$(coreboot_dir)/.config" \ savedefconfig && \ mv "$(build)/$(coreboot_base_dir)/defconfig" "$(pwd)/$(CONFIG_COREBOOT_CONFIG)" - + coreboot.save_in_oldconfig_format_in_place: mkdir -p "$(build)/$(coreboot_dir)" && \ cp "$(pwd)/$(CONFIG_COREBOOT_CONFIG)" "$(build)/$(coreboot_dir)/.config" && \ From 1eef518daa92d81ee5368ae1ed6262936d93426e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Tue, 13 Feb 2024 17:29:46 +0100 Subject: [PATCH 07/16] modules/coreboot: don't touch DMI vendor name if unspecified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Kopeć Signed-off-by: Thierry Laurion --- modules/coreboot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/coreboot b/modules/coreboot index 21579c7f..3f11e772 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -113,7 +113,6 @@ $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config CONFIG_COREBOOT_LOCALVERSION ?= $(BRAND_NAME)-$(HEADS_GIT_VERSION) CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD) -CONFIG_COREBOOT_SMBIOS_MANUFACTURER ?= $(BRAND_NAME) # Ensure that touching the config file will force a rebuild $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG) @@ -136,12 +135,14 @@ else endif $(coreboot_module)_configure := \ - mkdir -p "$(build)/$(coreboot_dir)" \ - && $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config) \ - && echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config \ - && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config \ - && echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config \ - && $(MAKE) olddefconfig \ + mkdir -p "$(build)/$(coreboot_dir)"; \ + $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config); \ + echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config; \ + echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config; \ + if [ ! -z "$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)" ]; then \ + echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config; \ + fi; \ + $(MAKE) olddefconfig \ -C "$(build)/$(coreboot_base_dir)" \ obj="$(build)/$(coreboot_dir)" \ DOTCONFIG="$(build)/$(coreboot_dir)/.config" \ From 83f96aae5c2ed9edabbd54898f5bda0c4f6f728f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Fri, 16 Feb 2024 14:01:09 +0100 Subject: [PATCH 08/16] modules/coreboot: Remove the lines with config values before overriding them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- modules/coreboot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/coreboot b/modules/coreboot index 3f11e772..1d4afa57 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -137,9 +137,12 @@ endif $(coreboot_module)_configure := \ mkdir -p "$(build)/$(coreboot_dir)"; \ $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config); \ + sed -i '/^CONFIG_LOCALVERSION/d' $(build)/$(coreboot_dir)/.config; \ echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config; \ + sed -i '/^CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME/d' $(build)/$(coreboot_dir)/.config; \ echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config; \ if [ ! -z "$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)" ]; then \ + sed -i '/^CONFIG_MAINBOARD_SMBIOS_MANUFACTURER/d' $(build)/$(coreboot_dir)/.config; \ echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config; \ fi; \ $(MAKE) olddefconfig \ From 23976461d81b973896f15fa8b5d810fb95bd7ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Fri, 16 Feb 2024 15:25:54 +0100 Subject: [PATCH 09/16] modules/coreboot: Avoid double quotes in LOCALVERSION MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żygowski Signed-off-by: Thierry Laurion --- modules/coreboot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/coreboot b/modules/coreboot index 1d4afa57..5e965d48 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -111,7 +111,7 @@ $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) # coreboot builds are specialized on a per-target basis. # The builds are done in a per-target subdirectory CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config -CONFIG_COREBOOT_LOCALVERSION ?= $(BRAND_NAME)-$(HEADS_GIT_VERSION) +CONFIG_COREBOOT_LOCALVERSION ?= "$(BRAND_NAME)-$(HEADS_GIT_VERSION)" CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD) # Ensure that touching the config file will force a rebuild @@ -138,7 +138,7 @@ $(coreboot_module)_configure := \ mkdir -p "$(build)/$(coreboot_dir)"; \ $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config); \ sed -i '/^CONFIG_LOCALVERSION/d' $(build)/$(coreboot_dir)/.config; \ - echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config; \ + echo 'CONFIG_LOCALVERSION=$(CONFIG_COREBOOT_LOCALVERSION)' >> $(build)/$(coreboot_dir)/.config; \ sed -i '/^CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME/d' $(build)/$(coreboot_dir)/.config; \ echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config; \ if [ ! -z "$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)" ]; then \ From 7e31b204e13fb80dc956222345a8c47161586178 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 5 May 2024 11:25:46 -0400 Subject: [PATCH 10/16] nv41/ns50 coreboot config: make sure everything is saved with make BOARD=nitropad-n*** coreboot.modify_and_save_oldconfig_in_place Signed-off-by: Thierry Laurion --- config/coreboot-nitropad-ns50.config | 18 ++++++++++++++++-- config/coreboot-nitropad-nv41.config | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/config/coreboot-nitropad-ns50.config b/config/coreboot-nitropad-ns50.config index 1b545754..90759c4c 100644 --- a/config/coreboot-nitropad-ns50.config +++ b/config/coreboot-nitropad-ns50.config @@ -215,7 +215,7 @@ CONFIG_ROM_SIZE=0x02000000 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y -# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set +#CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set # CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set CONFIG_MAINBOARD_POWER_FAILURE_STATE=0 # end of Mainboard @@ -521,6 +521,20 @@ CONFIG_INTEL_ME_DEFAULT_STATE=2 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set CONFIG_UNLOCK_FLASH_REGIONS=y CONFIG_BIOS_VENDOR="3mdeb" + +# +# =================================== Dasharo ==================================== +# + +# +# Dasharo Configuration +# +CONFIG_DASHARO_PREFER_S3_SLEEP=y +# end of Dasharo Configuration + +# +# ================================================================================ +# CONFIG_UDK_BASE=y CONFIG_UDK_202005_BINDING=y CONFIG_UDK_2013_VERSION=2013 @@ -692,7 +706,7 @@ CONFIG_VBOOT_LIB=y # # Trusted Platform Module # -# CONFIG_NO_TPM is not set +# CONFIG_TPM1 is not set CONFIG_TPM2=y CONFIG_TPM=y CONFIG_MAINBOARD_HAS_TPM2=y diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index 3cea462c..53cd03f7 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -521,6 +521,20 @@ CONFIG_INTEL_ME_DEFAULT_STATE=2 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set CONFIG_UNLOCK_FLASH_REGIONS=y CONFIG_BIOS_VENDOR="3mdeb" + +# +# =================================== Dasharo ==================================== +# + +# +# Dasharo Configuration +# +CONFIG_DASHARO_PREFER_S3_SLEEP=y +# end of Dasharo Configuration + +# +# ================================================================================ +# CONFIG_UDK_BASE=y CONFIG_UDK_202005_BINDING=y CONFIG_UDK_2013_VERSION=2013 @@ -692,7 +706,7 @@ CONFIG_VBOOT_LIB=y # # Trusted Platform Module # -# CONFIG_NO_TPM is not set +# CONFIG_TPM1 is not set CONFIG_TPM2=y CONFIG_TPM=y CONFIG_MAINBOARD_HAS_TPM2=y From eb2d8da9833bf77862a9da2444feb8a645315b0c Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 5 May 2024 12:14:27 -0400 Subject: [PATCH 11/16] nv41/ns50 coreboot config: apply 4cf15f2586c55d7c2f2c5136f08e7670eebc5012 also to ns50. Note: SMMSTORE and top-down resource allocation diff between ns50/nv41 Signed-off-by: Thierry Laurion --- config/coreboot-nitropad-ns50.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/coreboot-nitropad-ns50.config b/config/coreboot-nitropad-ns50.config index 90759c4c..6bbeaddd 100644 --- a/config/coreboot-nitropad-ns50.config +++ b/config/coreboot-nitropad-ns50.config @@ -39,8 +39,7 @@ CONFIG_BOOTSPLASH_IMAGE=y CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=90 -CONFIG_BOOTSPLASH_CONVERT_RESIZE=y -CONFIG_BOOTSPLASH_CONVERT_RESOLUTION="1920x1080" +# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set # CONFIG_BOOTSPLASH_CONVERT_COLORSWAP is not set # CONFIG_FW_CONFIG is not set From 443955e0862528de8f584b1fe720e02d3ebb6a4e Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 5 May 2024 12:16:23 -0400 Subject: [PATCH 12/16] nv41/ns50 board config: Add note referring that those boards FB are GOP enabled just like the librem_11 for reference Signed-off-by: Thierry Laurion --- boards/nitropad-ns50/nitropad-ns50.config | 1 + boards/nitropad-nv41/nitropad-nv41.config | 1 + 2 files changed, 2 insertions(+) diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config index 29428dc6..688122a4 100644 --- a/boards/nitropad-ns50/nitropad-ns50.config +++ b/boards/nitropad-ns50/nitropad-ns50.config @@ -1,4 +1,5 @@ # Nitrokey Nitropad NS51 board configuration +# Note: for reference, other GOP enabled FB board is librem_11 export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=nitrokey diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index b1e96dbc..44234d1e 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -1,4 +1,5 @@ # Nitrokey Nitropad NV41 board configuration +# Note: for reference, other GOP enabled FB board is librem_11 export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=nitrokey From f6f216c5b88b7911b2d852f4598afb1fcce7d6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Wed, 14 Feb 2024 16:57:05 +0100 Subject: [PATCH 13/16] Use single coreboot rev for MSI and NCM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Kopeć Signed-off-by: Thierry Laurion --- boards/nitropad-ns50/nitropad-ns50.config | 2 +- boards/nitropad-nv41/nitropad-nv41.config | 2 +- modules/coreboot | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config index 688122a4..16490feb 100644 --- a/boards/nitropad-ns50/nitropad-ns50.config +++ b/boards/nitropad-ns50/nitropad-ns50.config @@ -2,7 +2,7 @@ # Note: for reference, other GOP enabled FB board is librem_11 export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=nitrokey +export CONFIG_COREBOOT_VERSION=dasharo export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-ns50.config diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index 44234d1e..7ba4d589 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -2,7 +2,7 @@ # Note: for reference, other GOP enabled FB board is librem_11 export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=nitrokey +export CONFIG_COREBOOT_VERSION=dasharo export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-nv41.config diff --git a/modules/coreboot b/modules/coreboot index 5e965d48..3d058f65 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -88,10 +88,10 @@ 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 -coreboot-nitrokey_repo := https://github.com/dasharo/coreboot -coreboot-nitrokey_commit_hash := a1787afa6b3bf4d3b201cfdbe2ef69623072afa5 -$(eval $(call coreboot_module,nitrokey,)) +# MSI and Nitropad NV41 / NS50 boards are based on Dasharo coreboot port +coreboot-dasharo_repo := https://github.com/dasharo/coreboot +coreboot-dasharo_commit_hash := 3a9aa3a4692f3dd49732f5b4e3ec54be385f0969 +$(eval $(call coreboot_module,dasharo,)) # Check that the board configured the coreboot version correctly ifeq "$(CONFIG_COREBOOT_VERSION)" "" From 81cc5263a0898c36777eb0572d7816096466f66b Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 5 May 2024 13:48:11 -0400 Subject: [PATCH 14/16] nv41/ns50 coreboot configs: save configs with make BOARD=nitropad-n[v41|s50] coreboot.modify_and_save_oldconfig_in_place removes a comment: -# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set - Unify ns50/nv41 - CONFIG_TPM_PIRQ=0x27 in both nv41/ns50 as per https://github.com/linuxboot/heads/pull/1662#issuecomment-2100820944 NOTE that this doesn't stick when calling make[1]: Leaving directory '/home/user/heads/build/x86/coreboot-dasharo' user@heads-tests-deb12:~/heads$ git diff diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index 9484aaf5122..ddd4e5d7c56 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -143,7 +143,7 @@ CONFIG_BOARD_CLEVO_NV40PZ_BASE=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Nitropad NV41" CONFIG_CONSOLE_POST=y # CONFIG_USE_PM_ACPI_TIMER is not set -CONFIG_TPM_PIRQ=0x27 +CONFIG_TPM_PIRQ=0x0 # CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set CONFIG_VBOOT_FWID_VERSION="$(CONFIG_LOCALVERSION)" CONFIG_EC_SYSTEM76_EC_BAT_THRESHOLDS=y Also note that CONFIG_EC_SYSTEM76_EC_DGPU=y is not present on ns50 as opposed to nv41, whatever that does. user@heads-tests-deb12:~/heads$ diff -u config/coreboot-nitropad-nv41.config config/coreboot-nitropad-ns50.config --- config/coreboot-nitropad-nv41.config 2024-05-10 14:59:42.156754718 -0400 +++ config/coreboot-nitropad-ns50.config 2024-05-10 14:55:37.699761391 -0400 @@ -110,7 +110,7 @@ # CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_UP is not set CONFIG_MAINBOARD_FAMILY="Not Applicable" -CONFIG_MAINBOARD_PART_NUMBER="nv40pz" +CONFIG_MAINBOARD_PART_NUMBER="ns50pu" CONFIG_MAINBOARD_VERSION="v2.1" CONFIG_MAINBOARD_DIR="clevo/adl-p" CONFIG_DIMM_MAX=4 @@ -128,7 +128,7 @@ CONFIG_DEVICETREE="devicetree.cb" # CONFIG_VBOOT is not set CONFIG_VBOOT_VBNV_OFFSET=0x28 -CONFIG_VARIANT_DIR="nv40pz" +CONFIG_VARIANT_DIR="ns50pu" CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" # CONFIG_VGA_BIOS is not set CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Nitrokey" @@ -139,8 +139,8 @@ CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_BOARD_CLEVO_ADLP_COMMON=y -CONFIG_BOARD_CLEVO_NV40PZ_BASE=y -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Nitropad NV41" +CONFIG_BOARD_CLEVO_NS50PU_BASE=y +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Nitropad NS51" CONFIG_CONSOLE_POST=y # CONFIG_USE_PM_ACPI_TIMER is not set CONFIG_TPM_PIRQ=0x27 @@ -158,8 +158,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_DRIVERS_INTEL_WIFI=y -CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_adl/descriptor.bin" -CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/nv4x_adl/me.bin" +CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/descriptor.bin" +CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=9 CONFIG_CARDBUS_PLUGIN_SUPPORT=y @@ -176,8 +176,8 @@ # # Alder Lake P (2022) # -# CONFIG_BOARD_NOVACUSTOM_NS5X_ADLP is not set -CONFIG_BOARD_NOVACUSTOM_NV4X_ADLP=y +CONFIG_BOARD_NOVACUSTOM_NS5X_ADLP=y +# CONFIG_BOARD_NOVACUSTOM_NV4X_ADLP is not set # # Tiger Lake U (2021) @@ -503,7 +503,6 @@ # CONFIG_EC_ACPI=y CONFIG_EC_SYSTEM76_EC=y -CONFIG_EC_SYSTEM76_EC_DGPU=y # # Intel Firmware Signed-off-by: Thierry Laurion --- config/coreboot-nitropad-ns50.config | 14 ++++---------- config/coreboot-nitropad-nv41.config | 12 +++--------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/config/coreboot-nitropad-ns50.config b/config/coreboot-nitropad-ns50.config index 6bbeaddd..9e5dc0ee 100644 --- a/config/coreboot-nitropad-ns50.config +++ b/config/coreboot-nitropad-ns50.config @@ -214,7 +214,7 @@ CONFIG_ROM_SIZE=0x02000000 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y -#CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set +# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set # CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set CONFIG_MAINBOARD_POWER_FAILURE_STATE=0 # end of Mainboard @@ -522,7 +522,7 @@ CONFIG_UNLOCK_FLASH_REGIONS=y CONFIG_BIOS_VENDOR="3mdeb" # -# =================================== Dasharo ==================================== +# Dasharo # # @@ -531,9 +531,6 @@ CONFIG_BIOS_VENDOR="3mdeb" CONFIG_DASHARO_PREFER_S3_SLEEP=y # end of Dasharo Configuration -# -# ================================================================================ -# CONFIG_UDK_BASE=y CONFIG_UDK_202005_BINDING=y CONFIG_UDK_2013_VERSION=2013 @@ -605,7 +602,7 @@ CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y # CONFIG_SOFTWARE_I2C is not set CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 -CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y +# CONFIG_RESOURCE_ALLOCATION_TOP_DOWN is not set # end of Devices # @@ -616,13 +613,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 # CONFIG_ELOG is not set CONFIG_CACHE_MRC_SETTINGS=y CONFIG_MRC_SETTINGS_PROTECT=y -CONFIG_SMMSTORE=y -# CONFIG_SMMSTORE_V2 is not set -CONFIG_SMMSTORE_SIZE=0x40000 +# CONFIG_SMMSTORE is not set CONFIG_SPI_FLASH=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y -CONFIG_SPI_FLASH_SMM=y # CONFIG_SPI_FLASH_NO_FAST_READ is not set CONFIG_TPM_INIT_RAMSTAGE=y # CONFIG_TPM_PPI is not set diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index 53cd03f7..9484aaf5 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -143,7 +143,7 @@ CONFIG_BOARD_CLEVO_NV40PZ_BASE=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Nitropad NV41" CONFIG_CONSOLE_POST=y # CONFIG_USE_PM_ACPI_TIMER is not set -CONFIG_TPM_PIRQ=0x0 +CONFIG_TPM_PIRQ=0x27 # CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set CONFIG_VBOOT_FWID_VERSION="$(CONFIG_LOCALVERSION)" CONFIG_EC_SYSTEM76_EC_BAT_THRESHOLDS=y @@ -523,7 +523,7 @@ CONFIG_UNLOCK_FLASH_REGIONS=y CONFIG_BIOS_VENDOR="3mdeb" # -# =================================== Dasharo ==================================== +# Dasharo # # @@ -532,9 +532,6 @@ CONFIG_BIOS_VENDOR="3mdeb" CONFIG_DASHARO_PREFER_S3_SLEEP=y # end of Dasharo Configuration -# -# ================================================================================ -# CONFIG_UDK_BASE=y CONFIG_UDK_202005_BINDING=y CONFIG_UDK_2013_VERSION=2013 @@ -617,13 +614,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 # CONFIG_ELOG is not set CONFIG_CACHE_MRC_SETTINGS=y CONFIG_MRC_SETTINGS_PROTECT=y -CONFIG_SMMSTORE=y -# CONFIG_SMMSTORE_V2 is not set -CONFIG_SMMSTORE_SIZE=0x40000 +# CONFIG_SMMSTORE is not set CONFIG_SPI_FLASH=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y -CONFIG_SPI_FLASH_SMM=y # CONFIG_SPI_FLASH_NO_FAST_READ is not set CONFIG_TPM_INIT_RAMSTAGE=y # CONFIG_TPM_PPI is not set From 41d55bf2fcf9337da5dac240050b54c3583584a7 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 13 May 2024 11:03:23 -0400 Subject: [PATCH 15/16] coreboot + patches/coreboot-dasharo-unreleased: Add b35dc4a4f25497acfbe159d6abd057d885661a02.patch for TPM IRQ Kconfig missing Signed-off-by: Thierry Laurion --- modules/coreboot | 1 + ...c4a4f25497acfbe159d6abd057d885661a02.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch diff --git a/modules/coreboot b/modules/coreboot index 3d058f65..aaebdc14 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -91,6 +91,7 @@ $(eval $(call coreboot_module,purism,)) # MSI and Nitropad NV41 / NS50 boards are based on Dasharo coreboot port coreboot-dasharo_repo := https://github.com/dasharo/coreboot coreboot-dasharo_commit_hash := 3a9aa3a4692f3dd49732f5b4e3ec54be385f0969 +coreboot-dasharo_patch_version := unreleased $(eval $(call coreboot_module,dasharo,)) # Check that the board configured the coreboot version correctly diff --git a/patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch b/patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch new file mode 100644 index 00000000..ce2c009b --- /dev/null +++ b/patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch @@ -0,0 +1,27 @@ +From b35dc4a4f25497acfbe159d6abd057d885661a02 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= +Date: Mon, 13 May 2024 09:31:27 +0200 +Subject: [PATCH] src/mainboard/clevo/adl-p/Kconfig: Add missing TPM PIRQ for + NV41 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michał Żygowski +--- + src/mainboard/clevo/adl-p/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mainboard/clevo/adl-p/Kconfig b/src/mainboard/clevo/adl-p/Kconfig +index c091584ac7d..462cb7135b3 100644 +--- a/src/mainboard/clevo/adl-p/Kconfig ++++ b/src/mainboard/clevo/adl-p/Kconfig +@@ -115,7 +115,7 @@ config FMDFILE + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT && VBOOT_SLOTS_RW_A + + config TPM_PIRQ +- default 0x27 if BOARD_CLEVO_NS50PU_BASE # GPP_E1 ++ default 0x27 # GPP_E1 + + config SOC_INTEL_CSE_SEND_EOP_EARLY + default n From a51a7afefef2eec2e061576ab9f4ad4fc093b9bf Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 14 May 2024 12:09:22 -0400 Subject: [PATCH 16/16] patches/coreboot-dasharo-unreleased : keep track of patches per upsream dasharo+heads unreleased patches to apply on top of last release PR numbers being numerical and hopefully not conflicting with each other, keeping track of commits per their upstream PR should make sure they can be applied cleanly on top of each other as opposed to commit id related patches that git apply will apply in random order. Signed-off-by: Thierry Laurion --- ...5dc4a4f25497acfbe159d6abd057d885661a02.patch => 501.patch} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename patches/coreboot-dasharo-unreleased/{b35dc4a4f25497acfbe159d6abd057d885661a02.patch => 501.patch} (89%) diff --git a/patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch b/patches/coreboot-dasharo-unreleased/501.patch similarity index 89% rename from patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch rename to patches/coreboot-dasharo-unreleased/501.patch index ce2c009b..6f626ae3 100644 --- a/patches/coreboot-dasharo-unreleased/b35dc4a4f25497acfbe159d6abd057d885661a02.patch +++ b/patches/coreboot-dasharo-unreleased/501.patch @@ -1,4 +1,4 @@ -From b35dc4a4f25497acfbe159d6abd057d885661a02 Mon Sep 17 00:00:00 2001 +From 6cd77aa95a7ab46771874b72c7dba6b3600d9b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Mon, 13 May 2024 09:31:27 +0200 Subject: [PATCH] src/mainboard/clevo/adl-p/Kconfig: Add missing TPM PIRQ for @@ -13,7 +13,7 @@ Signed-off-by: Michał Żygowski 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainboard/clevo/adl-p/Kconfig b/src/mainboard/clevo/adl-p/Kconfig -index c091584ac7d..462cb7135b3 100644 +index 6e4b679d4d1..e9bcf53c7be 100644 --- a/src/mainboard/clevo/adl-p/Kconfig +++ b/src/mainboard/clevo/adl-p/Kconfig @@ -115,7 +115,7 @@ config FMDFILE