diff options
| -rw-r--r-- | src/mainboard/amd/bilby/Kconfig | 20 | ||||
| -rw-r--r-- | src/mainboard/amd/bilby/Makefile.inc | 16 | ||||
| -rw-r--r-- | src/mainboard/amd/bilby/board.fmd | 1 |
3 files changed, 1 insertions, 36 deletions
diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig index dbeae24895..3366705ddb 100644 --- a/src/mainboard/amd/bilby/Kconfig +++ b/src/mainboard/amd/bilby/Kconfig @@ -47,7 +47,7 @@ config SUPERIO_ADDR_BASE config CBFS_SIZE hex - default 0xfcf000 # Maximum size for the Bilby FMAP + default 0xfef000 # Maximum size for the Bilby FMAP config MAINBOARD_DIR string @@ -65,24 +65,6 @@ config ONBOARD_VGA_IS_PRIMARY bool 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 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 f9de6a4a73..b7a1c237d4 100644 --- a/src/mainboard/amd/bilby/Makefile.inc +++ b/src/mainboard/amd/bilby/Makefile.inc @@ -14,20 +14,4 @@ ifeq ($(CONFIG_BOARD_AMD_BILBY),y) 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 442d80f341..c7ba3eeac7 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) |