mb/amd/majolica: add functionality to add EC blob to build

Without the EC blob being present in the SPI flash, the board won't even
power up.

Change-Id: Ia3c50e86414bbc707bc33e28c636196c1be2f1e6
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48250
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Felix Held 2020-12-02 19:24:18 +01:00 committed by Patrick Georgi
parent d9fd2e2935
commit c6ef514e93
3 changed files with 42 additions and 0 deletions

View File

@ -7,10 +7,26 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_AMD_CEZANNE select SOC_AMD_CEZANNE
select MISSING_BOARD_RESET select MISSING_BOARD_RESET
config FMDFILE
string
default "src/mainboard/amd/majolica/board.fmd"
config MAINBOARD_DIR config MAINBOARD_DIR
default "amd/majolica" default "amd/majolica"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "MAJOLICA" default "MAJOLICA"
config MAJOLICA_HAVE_MCHP_FW
bool "Have Microchip EC firmware?"
default n
config MAJOLICA_MCHP_FW_FILE
string
depends on MAJOLICA_HAVE_MCHP_FW
default "3rdparty/blobs/mainboard/amd/majolica/EC_majolica.bin"
help
The EC firmware blob is usually the first 128kByte of the stock
firmware image.
endif # BOARD_AMD_MAJOLICA endif # BOARD_AMD_MAJOLICA

View File

@ -0,0 +1,18 @@
# SPDX-License-Identifier: GPL-2.0-only
PHONY+=add_mchp_fw
INTERMEDIATE+=add_mchp_fw
ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
add_mchp_fw: $(obj)/coreboot.pre
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward
else
files_added:: warn_no_mchp
endif # CONFIG_MAJOLICA_HAVE_MCHP_FW
PHONY+=warn_no_mchp
warn_no_mchp:
printf "\n\t** WARNING **\n"
printf "coreboot has been built without an the Microchip EC FW.\n"
printf "Do not flash this image. Your Majolica's power button\n"
printf "will not respond when you press it.\n\n"

View File

@ -0,0 +1,8 @@
FLASH@0xFF000000 16M {
BIOS {
EC 128K
RW_MRC_CACHE 64K
FMAP 4K
COREBOOT(CBFS)
}
}