erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/amd: Use mec152x tool

Browse source 
Instead of providing an EC_SIG binary blob, generate it at build time
using the mec152x tool. Allows to move the EC_BODY in the fmap without
the need to generate a new EC_SIG.

TEST=Booted on amd/birman_plus without EC_SIG blob.
Change-Id: I2d7a791820d905b088194b290853509f10689fc6
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/87429
Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Patrick Rudolph 2025-04-23 12:06:07 +02:00 • committed by Matt DeVillier
commit 3698517d82
6 changed files with 12 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/mainboard/amd/birman/Kconfig
View file

@ -52,15 +52,6 @@ config BIRMAN_HAVE_MCHP_FW
bool "Have Microchip EC firmware?"
default n
config BIRMAN_MCHP_SIG_FILE
string "Microchip EC signature file"
depends on BIRMAN_HAVE_MCHP_FW
default "3rdparty/blobs/mainboard/amd/birman/EC_birman_sig.bin"
help
The EC sig blob is the first 4kBytes of the firmware image.
The first 4 bytes form a pointer (with CRC) to where the EC firmware
is located
config AMD_SOC_CONSOLE_UART
default y if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD

7
src/mainboard/amd/birman/Makefile.mk
View file

@ -23,10 +23,11 @@ show_notices:: warn_no_apcb
endif
ifeq ($(CONFIG_BIRMAN_HAVE_MCHP_FW),y)
$(call add_intermediate, add_mchp_fw)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_SIG -f $(CONFIG_BIRMAN_MCHP_SIG_FILE) --fill-upward
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMAN_MCHP_FW_FILE) --fill-upward
subdirs-y += ../../../../util/mec152x
$(call add_intermediate, add_mchp_fw, $(objutil)/mec152x/mec152xtool)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMAN_MCHP_FW_FILE) --fill-upward
$(objutil)/mec152x/mec152xtool $(obj)/coreboot.pre GEN_ECFW_PTR -f EC_BODY
else
show_notices:: warn_no_mchp
endif # CONFIG_BIRMAN_HAVE_MCHP_FW

9
src/mainboard/amd/birman_plus/Kconfig
View file

@ -48,15 +48,6 @@ config BIRMANPLUS_HAVE_MCHP_FW
bool "Have Microchip EC firmware?"
default n
config BIRMANPLUS_MCHP_SIG_FILE
string "Microchip EC signature file"
depends on BIRMANPLUS_HAVE_MCHP_FW
default "3rdparty/blobs/mainboard/amd/birman_plus/EC_birmanplus_sig.bin"
help
The EC sig blob is the first 4kBytes of the firmware image.
The first 4 bytes form a pointer (with CRC) to where the EC firmware
is located
config AMD_SOC_CONSOLE_UART
default y if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD

7
src/mainboard/amd/birman_plus/Makefile.mk
View file

@ -20,10 +20,11 @@ show_notices:: warn_no_apcb
endif
ifeq ($(CONFIG_BIRMANPLUS_HAVE_MCHP_FW),y)
$(call add_intermediate, add_mchp_fw)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_SIG -f $(CONFIG_BIRMANPLUS_MCHP_SIG_FILE) --fill-upward
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMANPLUS_MCHP_FW_FILE) --fill-upward
subdirs-y += ../../../../util/mec152x
$(call add_intermediate, add_mchp_fw, $(objutil)/mec152x/mec152xtool)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMANPLUS_MCHP_FW_FILE) --fill-upward
$(objutil)/mec152x/mec152xtool $(obj)/coreboot.pre GEN_ECFW_PTR -f EC_BODY
else
show_notices:: warn_no_mchp
endif # CONFIG_BIRMAN_HAVE_MCHP_FW

8
src/mainboard/amd/crater/Kconfig
View file

@ -42,14 +42,6 @@ config CRATER_HAVE_MCHP_FW
bool "Have Microchip EC firmware?"
default n
config CRATER_MCHP_SIG_FILE
string "Microchip EC signature file"
depends on CRATER_HAVE_MCHP_FW
help
The EC sig blob is the first 4kBytes of the firmware image.
The first 4 bytes form a pointer (with CRC) to where the EC firmware
is located
config AMD_SOC_CONSOLE_UART
default y if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD

7
src/mainboard/amd/crater/Makefile.mk
View file

@ -18,10 +18,11 @@ show_notices:: warn_no_apcb
endif
ifeq ($(CONFIG_CRATER_HAVE_MCHP_FW),y)
$(call add_intermediate, add_mchp_fw)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_SIG -f $(CONFIG_CRATER_MCHP_SIG_FILE) --fill-upward
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_CRATER_MCHP_FW_FILE) --fill-upward
subdirs-y += ../../../../util/mec152x
$(call add_intermediate, add_mchp_fw, $(objutil)/mec152x/mec152xtool)
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_CRATER_MCHP_FW_FILE) --fill-upward
$(objutil)/mec152x/mec152xtool $(obj)/coreboot.pre GEN_ECFW_PTR -f EC_BODY
else
show_notices:: warn_no_mchp
endif