Rework recipes to use imx-generic-bsp more extensively

This rework the recipes making use of new imx-generic-bsp override; it
has been applied to:

 - alsa-state
 - firmware-imx
 - imx-kobs
 - imx-test
 - imx-uuc
 - linux-fslc
 - linux-fslc-lts
 - packagegroup-fsl-mfgtool
 - u-boot-fslc
 - uuu

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 3 insertions, 9 deletions

diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index 4d766139..b4b1eddf 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,10 +1,4 @@
-# Append path for freescale layer to include alsa-state asound.conf
-FILESEXTRAPATHS:prepend:mx6-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
-FILESEXTRAPATHS:prepend:mx7-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
-FILESEXTRAPATHS:prepend:mx8-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
-FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
+FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}/imx-generic-bsp:"
 
-PACKAGE_ARCH:mx6-nxp-bsp = "${MACHINE_ARCH}"
-PACKAGE_ARCH:mx7-nxp-bsp = "${MACHINE_ARCH}"
-PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_ARCH}"
-PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}"
+# Append path for freescale layer
+PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf
index c511018e..c511018e 100644
--- a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
+++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf
diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.state b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state
index ace734df..ace734df 100755
--- a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state