From f38e6969df9b5453b10d49be60b5d033d38b4594 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 14 Feb 2014 00:35:16 -0600 Subject: [PATCH] baytrail: use new chromeos ram oops API Utilize the newly introduced chromoes ram oops API. BUG=None BRANCH=baytrail,haswell TEST=Tested both ways with corresponding kernel change. ramoops is recovered using both methods. Change-Id: Id3495a99d72ec6d2afa6af0c899c0a5aaeeba84d Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/186394 Reviewed-by: Duncan Laurie --- src/soc/intel/baytrail/acpi/southcluster.asl | 4 ---- src/soc/intel/baytrail/northcluster.c | 8 +++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl index fac252f6fb..5382182659 100644 --- a/src/soc/intel/baytrail/acpi/southcluster.asl +++ b/src/soc/intel/baytrail/acpi/southcluster.asl @@ -198,10 +198,6 @@ Device (PDRC) Memory32Fixed(ReadWrite, MPHY_BASE_ADDRESS, MPHY_BASE_SIZE) Memory32Fixed(ReadWrite, PUNIT_BASE_ADDRESS, PUNIT_BASE_SIZE) Memory32Fixed(ReadWrite, RCBA_BASE_ADDRESS, RCBA_BASE_SIZE) -#if CONFIG_CHROMEOS_RAMOOPS - Memory32Fixed(ReadWrite, CONFIG_CHROMEOS_RAMOOPS_RAM_START, - CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE) -#endif }) // Current Resource Settings diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c index e259163616..ff5734cd55 100644 --- a/src/soc/intel/baytrail/northcluster.c +++ b/src/soc/intel/baytrail/northcluster.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -132,11 +133,8 @@ static void nc_read_resources(device_t dev) mmio_resource(dev, index++, (0xa0000 >> 10), (0xc0000 - 0xa0000) >> 10); reserved_ram_resource(dev, index++, (0xc0000 >> 10), (0x100000 - 0xc0000) >> 10); -#if CONFIG_CHROMEOS_RAMOOPS - reserved_ram_resource(dev, index++, - CONFIG_CHROMEOS_RAMOOPS_RAM_START >> 10, - CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE >> 10); -#endif + + chromeos_reserve_ram_oops(dev, index++); } static struct device_operations nc_ops = {