commit ce97bca09c342f8a418ffc4032e4848345895ab1
author Ravi Kumar Bokka <rbokka@codeaurora.org> Fri Mar 05 16:01:07 2021 +0530
committer Patrick Georgi <pgeorgi@google.com> Mon Mar 15 06:23:06 2021 +0000
tree 920d58ac9e6be8cfd3affd3f1cc2d42a7f6374c4
parent 8da56e6e75443ea6a6e2f0f883cf8d01cf48a02c

sc7180: make symbols common accross multiple targets.

making the symbols common accross targets to avoid duplicates for each soc.

Signed-off-by: Ravi Kumar Bokka <rbokka@codeaurora.org>
Change-Id: Ic60f46891dfadc7db5ece02756cb449aacdd63c5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51337
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shelley Chen <shchen@google.com>

src/soc/qualcomm/common/include/soc/symbols_common.h

diff --git a/src/soc/qualcomm/common/include/soc/symbols_common.h b/src/soc/qualcomm/common/include/soc/symbols_common.h
index bf48f37..3a316c4 100644
--- a/src/soc/qualcomm/common/include/soc/symbols_common.h
+++ b/src/soc/qualcomm/common/include/soc/symbols_common.h
@@ -8,5 +8,22 @@
 DECLARE_REGION(ddr_training);
 DECLARE_REGION(qclib_serial_log);
 DECLARE_REGION(ddr_information);
+DECLARE_REGION(ssram)
+DECLARE_REGION(bsram)
+DECLARE_REGION(dram_aop)
+DECLARE_REGION(dram_soc)
+DECLARE_REGION(dcb)
+DECLARE_REGION(pmic)
+DECLARE_REGION(limits_cfg)
+DECLARE_REGION(aop)
+DECLARE_REGION(shrm)
+DECLARE_REGION(dram_cpucp)
+DECLARE_REGION(aop_code_ram)
+DECLARE_REGION(aop_data_ram)
+DECLARE_REGION(dram_wlan)
+DECLARE_REGION(dram_wpss)
+DECLARE_REGION(dram_modem_wifi_only)
+DECLARE_REGION(dram_modem_extra)
+DECLARE_REGION(modem_id)
 
 #endif // _SOC_QUALCOMM_SYMBOLS_COMMON_H_

src/soc/qualcomm/sc7180/carve_out.c

diff --git a/src/soc/qualcomm/sc7180/carve_out.c b/src/soc/qualcomm/sc7180/carve_out.c
index 604abbd..e129005 100644
--- a/src/soc/qualcomm/sc7180/carve_out.c
+++ b/src/soc/qualcomm/sc7180/carve_out.c
@@ -2,7 +2,7 @@
 
 #include <arch/stages.h>
 #include <soc/mmu_common.h>
-#include <soc/symbols.h>
+#include <soc/symbols_common.h>
 #include <device/mmio.h>
 
 #define MODEM_ID_LTE 0x004c5445

src/soc/qualcomm/sc7180/include/soc/symbols.h

diff --git a/src/soc/qualcomm/sc7180/include/soc/symbols.h b/src/soc/qualcomm/sc7180/include/soc/symbols.h
deleted file mode 100644
index 1281d63..0000000
--- a/src/soc/qualcomm/sc7180/include/soc/symbols.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_QUALCOMM_SC7180_SYMBOLS_H_
-#define _SOC_QUALCOMM_SC7180_SYMBOLS_H_
-
-#include <symbols.h>
-
-DECLARE_REGION(ssram)
-DECLARE_REGION(bsram)
-DECLARE_REGION(dram_aop)
-DECLARE_REGION(dram_soc)
-DECLARE_REGION(dram_modem_wifi_only)
-DECLARE_REGION(dram_modem_extra)
-DECLARE_REGION(dcb)
-DECLARE_REGION(pmic)
-DECLARE_REGION(limits_cfg)
-DECLARE_REGION(aop_code_ram)
-DECLARE_REGION(aop_data_ram)
-DECLARE_REGION(modem_id)
-
-#endif /* _SOC_QUALCOMM_SC7180_SYMBOLS_H_ */

src/soc/qualcomm/sc7180/mmu.c

diff --git a/src/soc/qualcomm/sc7180/mmu.c b/src/soc/qualcomm/sc7180/mmu.c
index 8447c01..03e62e5 100644
--- a/src/soc/qualcomm/sc7180/mmu.c
+++ b/src/soc/qualcomm/sc7180/mmu.c
@@ -5,7 +5,7 @@
 #include <arch/cache.h>
 #include <soc/mmu.h>
 #include <soc/mmu_common.h>
-#include <soc/symbols.h>
+#include <soc/symbols_common.h>
 
 void sc7180_mmu_init(void)
 {

src/soc/qualcomm/sc7180/qclib.c

diff --git a/src/soc/qualcomm/sc7180/qclib.c b/src/soc/qualcomm/sc7180/qclib.c
index e6d54be..cafc970 100644
--- a/src/soc/qualcomm/sc7180/qclib.c
+++ b/src/soc/qualcomm/sc7180/qclib.c
@@ -2,7 +2,7 @@
 
 #include <cbfs.h>
 #include <fmap.h>
-#include <soc/symbols.h>
+#include <soc/symbols_common.h>
 #include <soc/qclib_common.h>
 
 int qclib_soc_blob_load(void)

src/soc/qualcomm/sc7180/soc.c

diff --git a/src/soc/qualcomm/sc7180/soc.c b/src/soc/qualcomm/sc7180/soc.c
index d8cade4..e7efff4 100644
--- a/src/soc/qualcomm/sc7180/soc.c
+++ b/src/soc/qualcomm/sc7180/soc.c
@@ -4,7 +4,7 @@
 #include <device/device.h>
 #include <soc/mmu.h>
 #include <soc/mmu_common.h>
-#include <soc/symbols.h>
+#include <soc/symbols_common.h>
 #include <soc/aop.h>
 
 static void soc_read_resources(struct device *dev)