Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48250 )
Change subject: mb/amd/majolica: add functionality to ad EC blob to build ......................................................................
mb/amd/majolica: add functionality to ad EC blob to build
Change-Id: Ia3c50e86414bbc707bc33e28c636196c1be2f1e6 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/mainboard/amd/majolica/Kconfig A src/mainboard/amd/majolica/Makefile.inc A src/mainboard/amd/majolica/board.fmd 3 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/48250/1
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig index b7f8763..2af1c35 100644 --- a/src/mainboard/amd/majolica/Kconfig +++ b/src/mainboard/amd/majolica/Kconfig @@ -5,10 +5,26 @@ 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 0000000..ce3119c --- /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 0000000..442d80f --- /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) + } +}
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48250
to look at the new patch set (#2).
Change subject: mb/amd/majolica: add functionality to add EC blob to build ......................................................................
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 --- M src/mainboard/amd/majolica/Kconfig A src/mainboard/amd/majolica/Makefile.inc A src/mainboard/amd/majolica/board.fmd 3 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/48250/2
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48250 )
Change subject: mb/amd/majolica: add functionality to add EC blob to build ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48250 )
Change subject: mb/amd/majolica: add functionality to add EC blob to build ......................................................................
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 --- M src/mainboard/amd/majolica/Kconfig A src/mainboard/amd/majolica/Makefile.inc A src/mainboard/amd/majolica/board.fmd 3 files changed, 42 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig index eeaf3b0..f811c39 100644 --- a/src/mainboard/amd/majolica/Kconfig +++ b/src/mainboard/amd/majolica/Kconfig @@ -7,10 +7,26 @@ 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 0000000..ce3119c --- /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 0000000..442d80f --- /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) + } +}
-
Felix Held (Code Review) -
Marshall Dawson (Code Review)
-
Patrick Georgi (Code Review)