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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50901
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Ritul Guru 2021-02-19 08:36:27 +05:30 committed by Felix Held
parent c79fc4737d
commit 3e945f1a23
3 changed files with 1 additions and 36 deletions

View File

@ -47,7 +47,7 @@ config SUPERIO_ADDR_BASE
config CBFS_SIZE config CBFS_SIZE
hex hex
default 0xfcf000 # Maximum size for the Bilby FMAP default 0xfef000 # Maximum size for the Bilby FMAP
config MAINBOARD_DIR config MAINBOARD_DIR
string string
@ -65,24 +65,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
config AMD_FWM_POSITION_INDEX
int
default 4
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 if !AMD_LPC_DEBUG_CARD
choice choice
prompt "State of IOMux for LPC/eMMC signals" prompt "State of IOMux for LPC/eMMC signals"

View File

@ -14,20 +14,4 @@ ifeq ($(CONFIG_BOARD_AMD_BILBY),y)
APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_bilby.bin APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_bilby.bin
endif 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 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/acpi

View File

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