summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2020-12-02 19:24:18 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-12-05 09:43:45 +0000
commitc6ef514e93734baafb5e613982dc3b249497960e (patch)
tree29d9f9e2d9c5c895040b3ffebdb05bbae54436d7
parentd9fd2e29356bfe182158f2bed391e9bf7f062c60 (diff)
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>
-rw-r--r--src/mainboard/amd/majolica/Kconfig16
-rw-r--r--src/mainboard/amd/majolica/Makefile.inc18
-rw-r--r--src/mainboard/amd/majolica/board.fmd8
3 files changed, 42 insertions, 0 deletions
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index eeaf3b04e2..f811c398e9 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -7,10 +7,26 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_AMD_CEZANNE
select MISSING_BOARD_RESET
+config FMDFILE
+ string
+ default "src/mainboard/amd/majolica/board.fmd"
+
config MAINBOARD_DIR
default "amd/majolica"
config MAINBOARD_PART_NUMBER
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
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
new file mode 100644
index 0000000000..ce3119c65d
--- /dev/null
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -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"
diff --git a/src/mainboard/amd/majolica/board.fmd b/src/mainboard/amd/majolica/board.fmd
new file mode 100644
index 0000000000..442d80f341
--- /dev/null
+++ b/src/mainboard/amd/majolica/board.fmd
@@ -0,0 +1,8 @@
+FLASH@0xFF000000 16M {
+ BIOS {
+ EC 128K
+ RW_MRC_CACHE 64K
+ FMAP 4K
+ COREBOOT(CBFS)
+ }
+}