From 5cae481856dd9c89eeecc6ff4cb6157dad84f6a5 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Sat, 29 Nov 2025 00:13:26 +0100 Subject: [PATCH] Makefile.mk: Use same FMAP_FLASH_SIZE for all architectures For both x86 and non-x86 its the same anyway, so factor it out. Signed-off-by: Maximilian Brune Change-Id: I30e6d1da8a663cd79d59d55446eda2b70269f118 Reviewed-on: https://review.coreboot.org/c/coreboot/+/90812 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- Makefile.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index e2b49b36fe..14f9b835d7 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -1085,6 +1085,8 @@ prebuild-files = $(foreach region,$(all-regions), \ # If no FMD file (Flashmap) is supplied by mainboard, fall back to a default ifeq ($(CONFIG_FMDFILE),) +FMAP_FLASH_SIZE := $(CONFIG_ROM_SIZE) + ifeq ($(CONFIG_ARCH_X86),y) DEFAULT_FLASHMAP:=$(top)/util/cbfstool/default-x86.fmd @@ -1098,8 +1100,6 @@ $(DEFAULT_FLASHMAP): $(call strip_quotes,$(CONFIG_IFD_BIN_PATH)) $(IFDTOOL) endif # ifeq($(CONFIG_HAVE_IFD_BIN),y) endif # ifneq($(CONFIG_IFD_CHIPSET),) -# entire flash -FMAP_FLASH_SIZE := $(CONFIG_ROM_SIZE) # entire "BIOS" region (everything directly of concern to the host system) FMAP_BIOS_BASE := $(call int-align, $(call int-subtract, $(CONFIG_ROM_SIZE) $(CONFIG_CBFS_SIZE)), 0x10000) FMAP_BIOS_SIZE := $(call int-align-down, $(shell echo $(CONFIG_CBFS_SIZE) | tr A-F a-f), 0x10000) @@ -1186,7 +1186,6 @@ else # ifeq ($(CONFIG_ARCH_X86),y) DEFAULT_FLASHMAP:=$(top)/util/cbfstool/default.fmd # entire flash -FMAP_FLASH_SIZE := $(CONFIG_ROM_SIZE) # entire "BIOS" region (everything directly of concern to the host system) FMAP_BIOS_BASE := 0 FMAP_BIOS_SIZE := $(CONFIG_CBFS_SIZE)