aspeed: remove common directory

Move recipes from the common dir to the layer base dir to match
typical layer layouts.

Change-Id: Idcd48dd346ab51b0a16fffe31319f13fad76111e
Tested: Built and verified witherspoon and palmetto images
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

15 files changed, 2 insertions, 2 deletions

diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
index 3a530db3c..79933c2b2 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
@@ -1,8 +1,8 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
-            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "aspeed-layer"
 BBFILE_PATTERN_aspeed-layer = ""
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
index 3d85f9974..3d85f9974 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/default-gcc.patch b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
index 04184df8b..04184df8b 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/default-gcc.patch
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
index 19ace4b88..19ace4b88 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
index b3a41a28a..b3a41a28a 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
index 054933057..054933057 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
index 713133ceb..713133ceb 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
index 9e85308cd..9e85308cd 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
index 28e458645..28e458645 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart.bb b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
index c0ee6771e..c0ee6771e 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
index f9b93c9e4..f9b93c9e4 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
index 55678405f..55678405f 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig
index ed1c470ba..ed1c470ba 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig
index 5183a7fd5..5183a7fd5 100755
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 42bff8fea..42bff8fea 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb
+++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb