summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVijay Hiremath <vijay.p.hiremath@intel.com>2021-02-18 17:05:35 -0800
committerCommit Bot <commit-bot@chromium.org>2021-02-22 22:47:18 +0000
commitada973720283439def6d728b653b5e8bcd6b4116 (patch)
treef1bf98bae34dc9566074452a5f2b144e7ccef57e
parentd6ff267da9db1fb51c456a3164f989db9ac137fa (diff)
downloadchrome-ec-ada973720283439def6d728b653b5e8bcd6b4116.tar.gz
adlrvp: cleanup: Move common files to baseboard
Moved the ADLRVP specific common files to baseboard so that the RVP variants with multiple MECC clients can leverage these files without copying them over to board files. BUG=none BRANCH=none TEST=make buildall -j Change-Id: I19739a189aa29c198422f1e2013d59f5da97b02f Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2706259 Reviewed-by: Sooraj Govindan <sooraj.govindan@intel.com> Reviewed-by: Poornima Tom <poornima.tom@intel.com> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--baseboard/intelrvp/adlrvp.c (renamed from board/adlrvpp_ite/adlrvp.c)0
-rw-r--r--baseboard/intelrvp/adlrvp.h (renamed from board/adlrvpp_ite/adlrvp.h)0
-rw-r--r--baseboard/intelrvp/adlrvp_battery.c (renamed from board/adlrvpp_ite/battery.c)0
-rw-r--r--baseboard/intelrvp/build.mk6
l---------board/adlrvpm_ite/adlrvp.c1
l---------board/adlrvpm_ite/adlrvp.h1
l---------board/adlrvpm_ite/battery.c1
-rw-r--r--board/adlrvpp_ite/build.mk3
8 files changed, 7 insertions, 5 deletions
diff --git a/board/adlrvpp_ite/adlrvp.c b/baseboard/intelrvp/adlrvp.c
index a9aac4eb0a..a9aac4eb0a 100644
--- a/board/adlrvpp_ite/adlrvp.c
+++ b/baseboard/intelrvp/adlrvp.c
diff --git a/board/adlrvpp_ite/adlrvp.h b/baseboard/intelrvp/adlrvp.h
index f87a235a4b..f87a235a4b 100644
--- a/board/adlrvpp_ite/adlrvp.h
+++ b/baseboard/intelrvp/adlrvp.h
diff --git a/board/adlrvpp_ite/battery.c b/baseboard/intelrvp/adlrvp_battery.c
index 315d5c247e..315d5c247e 100644
--- a/board/adlrvpp_ite/battery.c
+++ b/baseboard/intelrvp/adlrvp_battery.c
diff --git a/baseboard/intelrvp/build.mk b/baseboard/intelrvp/build.mk
index 2df42df47a..e3244a82f8 100644
--- a/baseboard/intelrvp/build.mk
+++ b/baseboard/intelrvp/build.mk
@@ -24,3 +24,9 @@ baseboard-$(VARIANT_INTELRVP_EC_MCHP)+=mchp_ec.o
#BC1.2 specific files
baseboard-$(CONFIG_BC12_DETECT_MAX14637)+=bc12.o
+
+#Common board specific files
+ifneq ($(filter y,$(BOARD_ADLRVPP_ITE) $(BOARD_ADLRVPM_ITE)),)
+baseboard-y+=adlrvp.o
+baseboard-$(CONFIG_BATTERY_SMART)+=adlrvp_battery.o
+endif
diff --git a/board/adlrvpm_ite/adlrvp.c b/board/adlrvpm_ite/adlrvp.c
deleted file mode 120000
index 2c01b35bb9..0000000000
--- a/board/adlrvpm_ite/adlrvp.c
+++ /dev/null
@@ -1 +0,0 @@
-../adlrvpp_ite/adlrvp.c \ No newline at end of file
diff --git a/board/adlrvpm_ite/adlrvp.h b/board/adlrvpm_ite/adlrvp.h
deleted file mode 120000
index d6d94a2fdf..0000000000
--- a/board/adlrvpm_ite/adlrvp.h
+++ /dev/null
@@ -1 +0,0 @@
-../adlrvpp_ite/adlrvp.h \ No newline at end of file
diff --git a/board/adlrvpm_ite/battery.c b/board/adlrvpm_ite/battery.c
deleted file mode 120000
index 9f747ee49f..0000000000
--- a/board/adlrvpm_ite/battery.c
+++ /dev/null
@@ -1 +0,0 @@
-../adlrvpp_ite/battery.c \ No newline at end of file
diff --git a/board/adlrvpp_ite/build.mk b/board/adlrvpp_ite/build.mk
index 4476638a1a..fe5f548324 100644
--- a/board/adlrvpp_ite/build.mk
+++ b/board/adlrvpp_ite/build.mk
@@ -11,5 +11,4 @@ CHIP_FAMILY:=it8320
CHIP_VARIANT:=it8320dx
BASEBOARD:=intelrvp
-board-y=board.o adlrvp.o
-board-$(CONFIG_BATTERY_SMART)+=battery.o
+board-y=board.o