From 76149f25c64175dfa397e45e7541f1acbd9c6b2d Mon Sep 17 00:00:00 2001
From: Maximilian Brune <maximilian.brune@9elements.com>
Date: Sat, 29 Nov 2025 00:05:03 +0100
Subject: [PATCH] treewide: Rename FMAP_ROM_SIZE -> FMAP_FLASH_SIZE

Its actually the size FMAP flash region so the name is more appropriate.

Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com>
Change-Id: I152b66abedb68f1ab809d918502efe096e9dde59
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90811
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 Makefile.mk                   | 6 +++---
 util/cbfstool/default-x86.fmd | 4 ++--
 util/cbfstool/default.fmd     | 4 ++--
 util/ifdtool/ifdtool.c        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.mk b/Makefile.mk
index 92098ba1b7..e2b49b36fe 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -1099,7 +1099,7 @@ endif # ifeq($(CONFIG_HAVE_IFD_BIN),y)
 endif # ifneq($(CONFIG_IFD_CHIPSET),)
 
 # entire flash
-FMAP_ROM_SIZE := $(CONFIG_ROM_SIZE)
+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,7 @@ else # ifeq ($(CONFIG_ARCH_X86),y)
 
 DEFAULT_FLASHMAP:=$(top)/util/cbfstool/default.fmd
 # entire flash
-FMAP_ROM_SIZE := $(CONFIG_ROM_SIZE)
+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)
@@ -1232,7 +1232,7 @@ FMAP_CBFS_SIZE := $(call int-subtract,$(FMAP_BIOS_SIZE) $(FMAP_CBFS_BASE))
 endif # ifeq ($(CONFIG_ARCH_X86),y)
 
 $(obj)/fmap.fmd: $(top)/Makefile.mk $(DEFAULT_FLASHMAP) $(obj)/config.h
-	sed -e "s,##ROM_SIZE##,$(call _tohex,$(FMAP_ROM_SIZE))," \
+	sed -e "s,##FLASH_SIZE##,$(call _tohex,$(FMAP_FLASH_SIZE))," \
 	    -e "s,##BIOS_BASE##,$(call _tohex,$(FMAP_BIOS_BASE))," \
 	    -e "s,##BIOS_SIZE##,$(call _tohex,$(FMAP_BIOS_SIZE))," \
 	    -e "s,##FMAP_BASE##,$(call _tohex,$(FMAP_FMAP_BASE))," \
diff --git a/util/cbfstool/default-x86.fmd b/util/cbfstool/default-x86.fmd
index 795e025f9f..d0e17b194e 100644
--- a/util/cbfstool/default-x86.fmd
+++ b/util/cbfstool/default-x86.fmd
@@ -1,5 +1,5 @@
 # layout for firmware residing at top of 4GB address space
-# +-------------+ <-- 4GB - ROM_SIZE / start of flash
+# +-------------+ <-- 4GB - FLASH_SIZE / start of flash
 # | unspecified |
 # +-------------+ <-- 4GB - BIOS_SIZE
 # | FMAP        |
@@ -7,7 +7,7 @@
 # | CBFS        |
 # +-------------+ <-- 4GB / end of flash
 
-FLASH ##ROM_SIZE## {
+FLASH ##FLASH_SIZE## {
 	BIOS@##BIOS_BASE## ##BIOS_SIZE## {
 		##CONSOLE_ENTRY##
 		##MRC_CACHE_ENTRY##
diff --git a/util/cbfstool/default.fmd b/util/cbfstool/default.fmd
index d20789f404..97cf441445 100644
--- a/util/cbfstool/default.fmd
+++ b/util/cbfstool/default.fmd
@@ -7,9 +7,9 @@
 # | FMAP        |
 # +-------------+ <-- BIOS_BASE + 128K + FMAP_SIZE
 # | CBFS        |
-# +-------------+ <-- ROM_SIZE
+# +-------------+ <-- FLASH_SIZE
 
-FLASH ##ROM_SIZE## {
+FLASH ##FLASH_SIZE## {
 	BIOS@##BIOS_BASE## ##BIOS_SIZE## {
 		BOOTBLOCK 128K
 		FMAP@##FMAP_BASE## ##FMAP_SIZE##
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 75238c73b2..0592785bf6 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_SIZE## {\n";
+	char *bbuf = "FLASH ##FLASH_SIZE## {\n";
 	if (write(layout_fd, bbuf, strlen(bbuf)) < 0) {
 		perror("Could not write to file");
 		exit(EXIT_FAILURE);