[coreboot-gerrit] Change in coreboot[master]: soc/intel: Switch guard to CHROMEOS_RAMOOPS

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

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50605 )

Change subject: soc/intel: Switch guard to CHROMEOS_RAMOOPS
......................................................................

soc/intel: Switch guard to CHROMEOS_RAMOOPS

Change-Id: I484220342b5c1055471403f562a8c9db6a403a05
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50605
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/soc/intel/baytrail/northcluster.c
M src/soc/intel/braswell/northcluster.c
M src/vendorcode/google/chromeos/chromeos.h
3 files changed, 4 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index 310ce4d..f4cbc94 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -120,7 +120,7 @@
    mmio_resource(dev, index++, (0xa0000 >> 10), (0xc0000 - 0xa0000) >> 10);
    reserved_ram_resource(dev, index++, (0xc0000 >> 10), (0x100000 - 0xc0000) >> 10);

-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_RAMOOPS))
    	chromeos_reserve_ram_oops(dev, index++);
 }

diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index 0ef58b2..339e293 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -146,7 +146,7 @@
    size_k = RES_IN_KiB(0x00100000);
    mmio_resource(dev, index++, base_k, size_k);

-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_RAMOOPS))
    	chromeos_reserve_ram_oops(dev, index++);
 }

diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 315d693..d023075 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -34,16 +34,12 @@

#if CONFIG(CHROMEOS_RAMOOPS)
 void chromeos_ram_oops_init(chromeos_acpi_t *chromeos);
-#if CONFIG(CHROMEOS_RAMOOPS_DYNAMIC)
-static inline void chromeos_reserve_ram_oops(struct device *dev, int idx) {}
-#else /* CONFIG_CHROMEOS_RAMOOPS_DYNAMIC */
-void chromeos_reserve_ram_oops(struct device *dev, int idx);
-#endif /* CONFIG_CHROMEOS_RAMOOPS_DYNAMIC */
 #else  /* !CONFIG_CHROMEOS_RAMOOPS */
 static inline void chromeos_ram_oops_init(chromeos_acpi_t *chromeos) {}
-static inline void chromeos_reserve_ram_oops(struct device *dev, int idx) {}
 #endif /* CONFIG_CHROMEOS_RAMOOPS */

+void chromeos_reserve_ram_oops(struct device *dev, int idx);
+
 void cbmem_add_vpd_calibration_data(void);
 void chromeos_set_me_hash(u32*, int);