Nitrokey boards coreboot version bump to match Dasharo+Heads heads+ coreboot version used in their v0.9.0 - 2024-02-29 BOM #1662
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,20 +88,18 @@ coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git | |
| coreboot-purism_commit_hash := 0d57cff58fba2f3a4d3a714a4eae65753e58c6ff | ||
| $(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 | ||
| 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 | ||
|
|
||
| coreboot_module := coreboot-$(CONFIG_COREBOOT_VERSION) | ||
| modules-y += $(coreboot_module) | ||
|
|
@@ -110,11 +108,12 @@ coreboot_dir := $($(coreboot_module)_dir) | |
| coreboot_base_dir := $($(coreboot_module)_base_dir) | ||
|
|
||
| $(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) | ||
|
|
@@ -137,11 +136,17 @@ else | |
| 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; \ | ||
|
Comment on lines
+139
to
+148
There was a problem hiding this comment.
edit: Nevermind, I see the intent to allow these to be overridden with site-local/config for rebranded devices. Suggested documenting that in-source so it's clearer. There was a problem hiding this comment. Oh I should have read the whole PR, sorry, I see some comments above about site-local, let me look over that |
||
| $(MAKE) olddefconfig \ | ||
| -C "$(build)/$(coreboot_base_dir)" \ | ||
| obj="$(build)/$(coreboot_dir)" \ | ||
| DOTCONFIG="$(build)/$(coreboot_dir)/.config" \ | ||
|
|
@@ -249,7 +254,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" && \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From 6cd77aa95a7ab46771874b72c7dba6b3600d9b29 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= <[email protected]> | ||
| 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 <[email protected]> | ||
| --- | ||
| 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 6e4b679d4d1..e9bcf53c7be 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 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see what the objective is for overriding these in site-local/config for rebranded devices. I'd suggest documenting the intent here so it's clear, folks like me will not ask about it over and over 😉
Maybe in the future we consider defaulting the board name to "not overridden" instead of the Heads board name, but that should probably be addressed separately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC we have competing schemes Dasharo/dasharo-issues#762
Please note that Dasharo cannot change the naming scheme arbitrarily because some customers and systems rely on that. Of course that doesn't mean our naming scheme is correct, but I only can vote for the scheme that generates more value e.g. saving developers time or serves better for users. I cannot resign from Dasharo branding despite the fact I would like to endorse Heads. So what, I think we should discuss is Heads and branding maybe even trademarks, what may need dedicated issue.
Going further Dasharo Supporting Pattern Agreement is the only prototype legal document which tries to establish relation between two entities (in this case 3mdeb owner of Dasharo and @tlaurion maintainer of Heads). Finally lets ask ourselves what is the legal status of heads branding?
P.S. no excuses, but I honestly would love to have more time to address those issues in correct way