[coreboot-gerrit] Change in coreboot[master]: Revert "lib/fmap: Disable pre-RAM cache for FSP 1.0"

[Kyösti Mälkki (Code Review)]

Hello Werner Zeh, Patrick Rudolph, Julius Werner, Huang Jin, Arthur Heymans, uwe taz, Philipp Deppenwiese, build bot (Jenkins), Patrick Georgi,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/37084

to review the following change.

Change subject: Revert "lib/fmap: Disable pre-RAM cache for FSP 1.0"
......................................................................

Revert "lib/fmap: Disable pre-RAM cache for FSP 1.0"

This reverts commit 7fc928656e791064c46a4748f86466930bdf2de6.

Reason for revert: Removal of FSP 1.0 support with 4.11 release

Change-Id: I1f074ed7252331c268249f222d529addf8fc5c5c
---
M src/arch/x86/car.ld
M src/drivers/intel/fsp1_0/Kconfig
M src/lib/Kconfig
M src/lib/fmap.c
M src/soc/rockchip/rk3288/Kconfig
5 files changed, 4 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/37084/1

diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 3680250..972cb52 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -58,10 +58,7 @@
 #endif

TIMESTAMP(., 0x200)
-
-#if !CONFIG(NO_FMAP_CACHE)
    FMAP_CACHE(., FMAP_SIZE)
-#endif

_car_ehci_dbg_info = .;
    /* Reserve sizeof(struct ehci_dbg_info). */
diff --git a/src/drivers/intel/fsp1_0/Kconfig b/src/drivers/intel/fsp1_0/Kconfig
index 1a1d4f7..32a0777 100644
--- a/src/drivers/intel/fsp1_0/Kconfig
+++ b/src/drivers/intel/fsp1_0/Kconfig
@@ -15,7 +15,6 @@
    bool
    default n
    select CAR_GLOBAL_MIGRATION
-	select NO_FMAP_CACHE	# doesn't work with CAR_GLOBAL restrictions
    help
      Selected for Intel processors/platform combinations that use the
      Intel Firmware Support Package (FSP) 1.0 for initialization.
diff --git a/src/lib/Kconfig b/src/lib/Kconfig
index dd9974a..cb1e4a5 100644
--- a/src/lib/Kconfig
+++ b/src/lib/Kconfig
@@ -68,10 +68,3 @@
    def_bool y

endif
-
-config NO_FMAP_CACHE
-	bool
-	help
-	  If your platform really doesn't want to use an FMAP cache (e.g. due to
-	  space constraints), you can select this to disable warnings and save
-	  a bit more code.
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index 48aab8f..4b4179c 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -60,9 +60,6 @@

static void setup_preram_cache(struct mem_region_device *cache_mrdev)
 {
-	if (CONFIG(NO_FMAP_CACHE))
-		return;
-
    if (!ENV_ROMSTAGE_OR_BEFORE) {
    	/* We get here if ramstage makes an FMAP access before calling
    	   cbmem_initialize(). We should avoid letting it come to that,
@@ -73,10 +70,10 @@
    }

if (REGION_SIZE(fmap_cache) == 0) {
-		/* If you see this you should add FMAP_CACHE() to your memlayout
-		   (or select NO_FMAP_CACHE if you can't afford the 2K). */
-		print_once(BIOS_ERR,
-			"ERROR: FMAP_CACHE enabled but no region provided!\n");
+		/* If you see this you really want to add an FMAP_CACHE to your
+		   memlayout, unless you absolutely can't affort the 2K. */
+		print_once(BIOS_NOTICE,
+			"NOTE: Running without FMAP_CACHE, should add it!\n");
    	return;
    }

diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 6a44ccd..3aebab9 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -29,7 +29,6 @@
    select MAINBOARD_FORCE_NATIVE_VGA_INIT
    select HAVE_LINEAR_FRAMEBUFFER
    select NO_BOOTBLOCK_CONSOLE
-	select NO_FMAP_CACHE

if SOC_ROCKCHIP_RK3288