commit dc0c02fe34fe72b81c0d49879ba342e1125ab535
author Kyösti Mälkki <kyosti.malkki@gmail.com> Wed Feb 10 18:10:17 2021 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Feb 16 09:37:28 2021 +0000
tree 5bd55df9b9511405a0dc63e67f5d28908d3a6005
parent 7fb69b01c388fd722fef7fdc6741d13ee5f81733

soc/intel: Switch guard to CHROMEOS_RAMOOPS

Change-Id: I484220342b5c1055471403f562a8c9db6a403a05
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50605
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/soc/intel/baytrail/northcluster.c

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++);
 }
 

src/soc/intel/braswell/northcluster.c

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++);
 }
 

src/vendorcode/google/chromeos/chromeos.h

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);