Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31561
Change subject: payloads/tianocore: Add option for custom bootsplash
......................................................................
payloads/tianocore: Add option for custom bootsplash
Add Kconfig options to use custom bootsplash file,
dependent on using MrChromebox's stable branch, with
help info conveying required file format.
Adjust Makefile to copy the custom bootsplash and
overwrite the default Logo.bmp file, handling both
absolute and relative paths, and restore the original
logo file after building so as to keep the working
directory clean.
Test: build with and without custom bootsplash, ensure
correct bootsplash displayed
Change-Id: I164f46777169801cff56633fd920bc81b7c8129a
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M payloads/external/Makefile.inc
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Makefile
3 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/31561/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 4fda725..7249553 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -135,6 +135,7 @@
CONFIG_TIANOCORE_DEBUG=$(CONFIG_TIANOCORE_DEBUG) \
CONFIG_TIANOCORE_TARGET_IA32=$(CONFIG_TIANOCORE_TARGET_IA32) \
CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \
+ CONFIG_TIANOCORE_BOOTSPLASH_FILE="$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" \
GCC_CC_x86_32=$(GCC_CC_x86_32) \
GCC_CC_x86_64=$(GCC_CC_x86_64) \
GCC_CC_arm=$(GCC_CC_arm) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index 79e09e6..12010ea 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -87,4 +87,24 @@
help
Use 8254 Timer for legacy support.
+config TIANOCORE_BOOTSPLASH_IMAGE
+ bool "Use a custom bootsplash image"
+ depends on TIANOCORE_STABLE
+ help
+ Select this option if you have a bootsplash image that you would
+ like to be used. If this option is not selected, the default
+ coreboot logo (European Brown Hare) will used.
+
+config TIANOCORE_BOOTSPLASH_FILE
+ string "Tianocore Bootsplash path and filename"
+ depends on TIANOCORE_BOOTSPLASH_IMAGE
+ default "bootsplash.bmp"
+ help
+ The path and filename of the file to use as graphical bootsplash
+ screen. The file format must be uncompressed BMP, and the file's
+ resolution must be less than the native resolution of the display.
+
+ If an absolute path is not given, the path will assumed to be
+ relative to the coreboot root directory.
+
endif
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index e4f395f..989f723 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -87,6 +87,15 @@
build: $(project_dir)/.version_$(TAG-y) checktools
unset CC; $(MAKE) -C $(project_dir)/BaseTools
echo " build $(project_name) $(TAG-y)"
+ if [ -n "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" ]; then \
+ echo " Copying custom bootsplash image"; \
+ if [[ "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" = /* ]]; then \
+ cp "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" "$(project_dir)/CorebootPayloadPkg/Logo/Logo.bmp"; \
+ else \
+ cp "$$(dirname "$$(dirname "$$(dirname "$(CURDIR)")")")/$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" \
+ "$(project_dir)/CorebootPayloadPkg/Logo/Logo.bmp"; \
+ fi; \
+ fi; \
cd $(project_dir); \
export EDK_TOOLS_PATH=$(project_dir)/BaseTools; \
export WORKSPACE=$(project_dir); \
@@ -96,7 +105,8 @@
cat ../tools_def.txt >> $(project_dir)/Conf/tools_def.txt; \
fi; \
build $(BUILD_STR); \
- mv $(project_dir)/Build/CorebootPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd
+ mv $(project_dir)/Build/CorebootPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \
+ git checkout CorebootPayloadPkg/Logo/Logo.bmp > /dev/null 2>&1
clean:
test -d $(project_dir) && (cd $(project_dir); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0
--
To view, visit https://review.coreboot.org/c/coreboot/+/31561
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I164f46777169801cff56633fd920bc81b7c8129a
Gerrit-Change-Number: 31561
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31663
Change subject: mb/siemens/mc_bdx1: Enable TPM2 on LPC
......................................................................
mb/siemens/mc_bdx1: Enable TPM2 on LPC
This mainboard has a TPM located on the LPC bus. Enable the driver for
it so that it is initialized and the ACPI table entry is generated.
Change-Id: I2eae63932658c2a9f752d28d7c08c27f48531360
Signed-off-by: Werner Zeh <werner.zeh(a)siemens.com>
---
M src/mainboard/siemens/mc_bdx1/Kconfig
M src/mainboard/siemens/mc_bdx1/devicetree.cb
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/31663/1
diff --git a/src/mainboard/siemens/mc_bdx1/Kconfig b/src/mainboard/siemens/mc_bdx1/Kconfig
index 667a6ee..d99fea8 100644
--- a/src/mainboard/siemens/mc_bdx1/Kconfig
+++ b/src/mainboard/siemens/mc_bdx1/Kconfig
@@ -14,6 +14,8 @@
select DRIVER_SIEMENS_NC_FPGA
select DRIVERS_I2C_RX6110SA
select DRIVERS_I2C_PCA9538
+ select MAINBOARD_HAS_TPM2
+ select MAINBOARD_HAS_LPC_TPM
config MAINBOARD_DIR
string
diff --git a/src/mainboard/siemens/mc_bdx1/devicetree.cb b/src/mainboard/siemens/mc_bdx1/devicetree.cb
index 6b5c118..fd7d83f 100644
--- a/src/mainboard/siemens/mc_bdx1/devicetree.cb
+++ b/src/mainboard/siemens/mc_bdx1/devicetree.cb
@@ -7,7 +7,11 @@
device pci 14.0 on end # xHCI Controller
device pci 19.0 on end # Gigabit LAN Controller
device pci 1d.0 on end # EHCI Controller
- device pci 1f.0 on end # LPC Bridge
+ device pci 1f.0 on # LPC Bridge
+ chip drivers/pc80/tpm
+ device pnp 0c31.0 on end
+ end
+ end # LPC Bridge
device pci 1f.2 on end # SATA Controller
device pci 1f.3 on
# Enable external RTC chip
--
To view, visit https://review.coreboot.org/c/coreboot/+/31663
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2eae63932658c2a9f752d28d7c08c27f48531360
Gerrit-Change-Number: 31663
Gerrit-PatchSet: 1
Gerrit-Owner: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-MessageType: newchange
Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30445
Change subject: soc/intel/cannonlake: Add option for boot frquency
......................................................................
soc/intel/cannonlake: Add option for boot frquency
Cannonlake/Coffeelake FSP have options for CPU boot up frequency
selection, expose that in coreboot side.
Signed-off-by: Lijian Zhao <lijian.zhao(a)intel.com>
Change-Id: I6bd5849122c9035bb7f448acf08e258e8c207013
---
M src/soc/intel/cannonlake/chip.h
M src/soc/intel/cannonlake/romstage/fsp_params.c
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/30445/1
diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h
index 3a723d2..7e50a73 100644
--- a/src/soc/intel/cannonlake/chip.h
+++ b/src/soc/intel/cannonlake/chip.h
@@ -110,6 +110,11 @@
SaGv_Enabled,
} SaGv;
+ /* Boot Frequency from reset vector.
+ * 0: Maximum battery performance, 1: Maximum non-turbo performance, 2:
+ * Maximum turbo performance @note If 2 is selected, system will start
+ * with non-turbo mode and then switch to turbo. */
+ uint8_t bootfreq;
/* Rank Margin Tool. 1:Enable, 0:Disable */
uint8_t RMT;
diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c
index c3a2509..0514844 100644
--- a/src/soc/intel/cannonlake/romstage/fsp_params.c
+++ b/src/soc/intel/cannonlake/romstage/fsp_params.c
@@ -54,6 +54,8 @@
#if IS_ENABLED(CONFIG_SOC_INTEL_COFFEELAKE)
m_cfg->SkipMpInit = !chip_get_fsp_mp_init();
#endif
+ m_cfg->BootFrequency = config->bootfreq;
+
/* If ISH is enabled, enable ISH elements */
if (!dev)
m_cfg->PchIshEnable = 0;
--
To view, visit https://review.coreboot.org/c/coreboot/+/30445
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6bd5849122c9035bb7f448acf08e258e8c207013
Gerrit-Change-Number: 30445
Gerrit-PatchSet: 1
Gerrit-Owner: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-MessageType: newchange
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31665
Change subject: cpu/intel/model_1067x: Don't try to apply MCU a second time
......................................................................
cpu/intel/model_1067x: Don't try to apply MCU a second time
Applying microcode updates a second time seems to be only necessary
on newer platforms (Nehalem+) for "uncore" updates.
Change-Id: Ia2ee9c70677190ffd1a08df1101d39a14fc2c384
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M src/cpu/intel/model_1067x/mp_init.c
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/31665/1
diff --git a/src/cpu/intel/model_1067x/mp_init.c b/src/cpu/intel/model_1067x/mp_init.c
index b8b3159..4b67893 100644
--- a/src/cpu/intel/model_1067x/mp_init.c
+++ b/src/cpu/intel/model_1067x/mp_init.c
@@ -85,9 +85,6 @@
/* Relocate the SMM handler. */
smm_relocate();
-
- /* After SMM relocation a 2nd microcode load is required. */
- intel_microcode_load_unlocked(microcode_patch);
}
static void post_mp_init(void)
--
To view, visit https://review.coreboot.org/c/coreboot/+/31665
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia2ee9c70677190ffd1a08df1101d39a14fc2c384
Gerrit-Change-Number: 31665
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31468 )
Change subject: rmodule: Add support for R_X86_64_PLT32
......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/31468/2//COMMIT_MSG
Commit Message:
https://review.coreboot.org/#/c/31468/2//COMMIT_MSG@13
PS2, Line 13: R_X86_64_PLT32
> I tried to disable it, but it's not possible. […]
That's helpful context here. Can you please include it and elaborate in the commit description?
--
To view, visit https://review.coreboot.org/c/coreboot/+/31468
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I81350d2728c20ac72cc865e7ba92319858352632
Gerrit-Change-Number: 31468
Gerrit-PatchSet: 2
Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Sol Boucher <solb(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Comment-Date: Thu, 28 Feb 2019 18:20:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Patrick Rudolph <siro(a)das-labor.org>
Comment-In-Reply-To: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-MessageType: comment
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31468 )
Change subject: rmodule: Add support for R_X86_64_PLT32
......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/31468/2//COMMIT_MSG
Commit Message:
https://review.coreboot.org/#/c/31468/2//COMMIT_MSG@13
PS2, Line 13: R_X86_64_PLT32
> I'm not sure we should be allowing the compiler/linker to emit these relocations. […]
I tried to disable it, but it's not possible.
It's tested on qemu and works fine.
It's also done here:
https://lists.gnu.org/archive/html/grub-devel/2018-02/msg00064.html
or here
https://lore.kernel.org/patchwork/patch/895855/
--
To view, visit https://review.coreboot.org/c/coreboot/+/31468
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I81350d2728c20ac72cc865e7ba92319858352632
Gerrit-Change-Number: 31468
Gerrit-PatchSet: 2
Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Sol Boucher <solb(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Comment-Date: Thu, 28 Feb 2019 18:18:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-MessageType: comment