ritul guru has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50901 )
Change subject: mb\amd\bilby: updating EC FW specific options for bilby ......................................................................
mb\amd\bilby: updating EC FW specific options for bilby
EC does not exist in Bilby platform, so removing EC size from board.fmd and updating bilby fmap size to 0xfef000. Removing unused EC FW config options MANDOLIN_HAVE_MCHP_FW and MANDOLIN_MCHP_FW_FILE.
Change-Id: I9ca4e421b0d80d041ed4046fa20cc16e24a776d0 Signed-off-by: Ritul Guru ritul.bits@gmail.com --- M src/mainboard/amd/bilby/Kconfig M src/mainboard/amd/bilby/Makefile.inc M src/mainboard/amd/bilby/board.fmd 3 files changed, 1 insertion(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/50901/1
diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig index dbeae24..07fecde 100644 --- a/src/mainboard/amd/bilby/Kconfig +++ b/src/mainboard/amd/bilby/Kconfig @@ -47,7 +47,7 @@
config CBFS_SIZE hex - default 0xfcf000 # Maximum size for the Bilby FMAP + default 0xfef000 if BOARD_AMD_BILBY # Maximum size for the Bilby FMAP
config MAINBOARD_DIR string @@ -71,18 +71,6 @@ help TODO: might need to be adapted for better placement of files in cbfs
-config MANDOLIN_HAVE_MCHP_FW - bool "Have Microchip EC firmware?" - default n - -config MANDOLIN_MCHP_FW_FILE - string - depends on MANDOLIN_HAVE_MCHP_FW - default "3rdparty/blobs/mainboard/amd/mandolin/EC_mandolin.bin" if BOARD_AMD_MANDOLIN - default "3rdparty/blobs/mainboard/amd/mandolin/EC_cereme.bin" if BOARD_AMD_BILBY - help - The EC firmware blob is usually the first 128kByte of the stock - firmware image. if !AMD_LPC_DEBUG_CARD choice prompt "State of IOMux for LPC/eMMC signals" diff --git a/src/mainboard/amd/bilby/Makefile.inc b/src/mainboard/amd/bilby/Makefile.inc index f9de6a4..b7a1c23 100644 --- a/src/mainboard/amd/bilby/Makefile.inc +++ b/src/mainboard/amd/bilby/Makefile.inc @@ -14,20 +14,4 @@ APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_bilby.bin endif
-ifeq ($(CONFIG_MANDOLIN_HAVE_MCHP_FW),y) - -$(call add_intermediate, add_mchp_fw) - $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward - -else -files_added:: warn_no_mchp -endif # CONFIG_MANDOLIN_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.\n" - printf "Do not flash this image. Your Mandolin's power button\n" - printf "will not respond when you press it.\n\n" - CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/acpi diff --git a/src/mainboard/amd/bilby/board.fmd b/src/mainboard/amd/bilby/board.fmd index 442d80f..c7ba3ee 100644 --- a/src/mainboard/amd/bilby/board.fmd +++ b/src/mainboard/amd/bilby/board.fmd @@ -1,6 +1,5 @@ FLASH@0xFF000000 16M { BIOS { - EC 128K RW_MRC_CACHE 64K FMAP 4K COREBOOT(CBFS)