From 171e56546f5661a68b3587b3fc558214995a6fd9 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 28 Dec 2018 15:41:40 +0000
Subject: [PATCH] Pull from the armxx common directory.

---
 .../arm-accton-as4610-30/modules/builds/Makefile              | 4 ++--
 .../platform-config/r0/builds/dtb/Makefile                    | 2 +-
 .../arm-accton-as4610-54/modules/builds/Makefile              | 4 ++--
 .../platform-config/r0/builds/dtb/Makefile                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile
index 440a0ff3..c784eedb 100644
--- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile
+++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/modules/builds/Makefile
@@ -1,6 +1,6 @@
 KERNELS := onl-kernel-4.14-lts-armel-iproc-all:armel
-KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.c)
-KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.h)
+KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610/modules/*.c)
+KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610/modules/*.h)
 VENDOR := accton
 BASENAME := arm-accton-as4610-30
 ARCH := arm
diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile
index d3118ad6..ddb50093 100644
--- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile
+++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-30/platform-config/r0/builds/dtb/Makefile
@@ -1,7 +1,7 @@
 INCLUDES=include .
 KERNEL := onl-kernel-4.14-lts-armel-iproc-all:armel
 DTS_LIST := arm-accton-as4610.dts
-VPATH := ../../../../../src
+VPATH := $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610
 include $(ONL)/make/dtbs.mk
 
 #
diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile
index 9acef27d..93050af0 100644
--- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile
+++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/modules/builds/Makefile
@@ -1,6 +1,6 @@
 KERNELS := onl-kernel-4.14-lts-armel-iproc-all:armel
-KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.c)
-KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armel/arm-accton-as4610/src/modules/*.h)
+KMODULES := $(wildcard $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610/modules/*.c)
+KINCLUDES := $(wildcard $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610/modules/*.h)
 VENDOR := accton
 BASENAME := arm-accton-as4610-54
 ARCH := arm
diff --git a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile
index d3118ad6..ddb50093 100644
--- a/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile
+++ b/packages/platforms/accton/armel/arm-accton-as4610/arm-accton-as4610-54/platform-config/r0/builds/dtb/Makefile
@@ -1,7 +1,7 @@
 INCLUDES=include .
 KERNEL := onl-kernel-4.14-lts-armel-iproc-all:armel
 DTS_LIST := arm-accton-as4610.dts
-VPATH := ../../../../../src
+VPATH := $(ONL)/packages/platforms/accton/armxx/arm-accton-as4610
 include $(ONL)/make/dtbs.mk
 
 #