nuvoton: move npcm7xx support into meta-nuvoton layer

Move support for the npcm7xx SOCs directly into the meta-nuvoton BSP
layer. This matches the layout for other chip vendors' BSPs.

Change-Id: I47ac7a5b02cf87f6dd60d0f6fba2463c18e9fdf1
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf b/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf
index 62d1a53..1fefedb 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf
@@ -1,9 +1,9 @@
 # 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 += "nuvoton"
-BBFILE_PATTERN_nuvoton = ""
-LAYERVERSION_nuvoton = "1"
+BBFILE_COLLECTIONS += "nuvoton-layer"
+BBFILE_PATTERN_nuvoton-layer = ""
+LAYERVERSION_nuvoton-layer = "1"