From d65bb0b9fc3775c7bdcbebf4ee1317ddc2335425 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Sat, 12 Apr 2025 14:11:09 +0200 Subject: [PATCH] treewide: Remove remainders of ROM_BASE commit a7eb390796ef ("mb/*/*/*.fmd: Start flash at 0") caused a build failure for all mainboards that generate their FMAP from the IFD (so intel only) instead of providing one themselves. Jenkins didn't catch that, because apparently all mainboards that have the IFD in the 3rdparty/blobs repository provide a custom FMAP. So there was no defconfig that jenkins tested that would come across this issue. Signed-off-by: Maximilian Brune Change-Id: Ia9852e8ef48148264d2d3f73eb667f3eb8b85005 Reviewed-on: https://review.coreboot.org/c/coreboot/+/87288 Reviewed-by: Matt DeVillier Reviewed-by: Shuo Liu Reviewed-by: Frans Hendriks Reviewed-by: Erik van den Bogaert Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- Makefile.mk | 2 -- util/ifdtool/ifdtool.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index 19bac29060..576cebd904 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -1098,7 +1098,6 @@ endif # ifneq($(CONFIG_IFD_CHIPSET),) # entire flash FMAP_ROM_SIZE := $(CONFIG_ROM_SIZE) # entire "BIOS" region (everything directly of concern to the host system) -# relative to ROM_BASE 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) # position and size of flashmap, relative to BIOS_BASE @@ -1186,7 +1185,6 @@ DEFAULT_FLASHMAP:=$(top)/util/cbfstool/default.fmd # entire flash FMAP_ROM_SIZE := $(CONFIG_ROM_SIZE) # entire "BIOS" region (everything directly of concern to the host system) -# relative to ROM_BASE FMAP_BIOS_BASE := 0 FMAP_BIOS_SIZE := $(CONFIG_CBFS_SIZE) # position and size of flashmap, relative to BIOS_BASE diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 94105efe52..b21a89c0e1 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -1094,7 +1094,7 @@ static void create_fmap_template(char *image, int size, const char *layout_fname exit(EXIT_FAILURE); } - char *bbuf = "FLASH@##ROM_BASE## ##ROM_SIZE## {\n"; + char *bbuf = "FLASH ##ROM_SIZE## {\n"; if (write(layout_fd, bbuf, strlen(bbuf)) < 0) { perror("Could not write to file"); exit(EXIT_FAILURE);