overrides: Fix _ vs : syntax, use mx6, mx6ull and mx8

We reintroduced the plain mx8, mx8mm and mx8mp overrides without
-generic-bsp appendix. This changes the usage back to those.

conf/distro/include/seconorth-distro.inc

@@ -42,7 +42,7 @@ DISTRO_RELEASE_ARTEFACTS = " \
 # On imx8m we currently don't have the complete config infrastructure
 # so we need to specify the devicetree to use. For this we need the files
 # additionally outside the image
-DISTRO_RELEASE_ARTEFACTS:append:mx8-generic-bsp = " \
+DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
     ${@' '.join([ dtb.split('/')[-1] for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
     Image \
 "

conf/distro/seconorth-fngsystem.conf

@@ -48,15 +48,15 @@ IMAGE_BOOT_FILES:append = " ${DISTRO_BOOT_FILES} "
 # are used by the CI to copy/or link the needed files into the release folder
 
 DISTRO_INSTALL_SCRIPTS = "fngsystem-self-update.sh fngsystem-self-init.sh "
-DISTRO_INSTALL_SCRIPTS:append:mx8-generic-bsp = " fng-install-uboot.sh "
+DISTRO_INSTALL_SCRIPTS:append:mx8 = " fng-install-uboot.sh "
 
 DISTRO_IMAGES = "${IMAGE_LINK_NAME}.tgz ${IMAGE_LINK_NAME}.cpio.gz"
-DISTRO_IMAGES:append:mx8 = " imx-boot.tar.gz imx-boot "
+DISTRO_IMAGES:append:mx8= " imx-boot.tar.gz imx-boot "
 
 # List build results that are later handled in the CI
 DISTRO_RELEASE_ARTEFACTS:append = "${IMAGE_LINK_NAME}.md5 "
 
-DISTRO_RELEASE_ARTEFACTS:append:mx8-generic-bsp = " \
+DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
     ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.bat' for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \
     ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.sh'  for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \
     \

recipes-bsp/alsa-state/alsa-state.bbappend

@@ -4,17 +4,7 @@
 # Append path for freescale layer to include alsa-state asound.conf
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:mx6-generic-bsp = " \
-    file://asound.state \
-    file://asound.conf \
-"
-
-SRC_URI:append:mx6ull-generic-bsp = " \
-    file://asound.state \
-    file://asound.conf \
-"
-
-SRC_URI:append:mx8-generic-bsp = " \
+SRC_URI:append = " \
     file://asound.state \
     file://asound.conf \
 "

recipes-bsp/fng-install/prepare-image.bb

@@ -18,12 +18,13 @@ SRC_URI = " \
     file://gf-prepare-overlays.sh \
 "
 
-SRC_URI:append:mx6-generic-bsp = " \
+SRC_URI:append:mx6 = " \
     file://gf-prepare-dt.sh \
     file://gf-prepare-xml2dto.sh \
 "
 
-SRC_URI:append:mx8-generic-bsp = " \
+# Actually this is for Tanaro only
+SRC_URI:append:mx8mm = " \
     file://gf-prepare-rtc.sh \
 "
 
@@ -47,14 +48,14 @@ do_install() {
     ln -s ${sbindir}/gf-prepare-bootpartition.sh ${D}${sysconfdir}/fng-postinstall/40-gf-prepare-bootpartition
 }
 
-do_install:append:mx6-generic-bsp() {
+do_install:append:mx6() {
     install -m 0755 ${WORKDIR}/gf-prepare-dt.sh ${D}${sbindir}
     install -m 0755 ${WORKDIR}/gf-prepare-xml2dto.sh ${D}${sbindir}
     ln -s ${sbindir}/gf-prepare-dt.sh ${D}${sysconfdir}/fng-postinstall/12-gf-prepare-dt
     ln -s ${sbindir}/gf-prepare-xml2dto.sh ${D}${sysconfdir}/fng-postinstall/13-gf-prepare-xml2dto
 }
 
-do_install:append:mx8-generic-bsp() {
+do_install:append:mx8mm() {
     install -m 0755 ${WORKDIR}/gf-prepare-rtc.sh ${D}${sbindir}
     ln -s ${sbindir}/gf-prepare-rtc.sh ${D}${sysconfdir}/fng-postinstall/14-gf-prepare-rtc
 }

recipes-core/base-files/base-files_%.bbappend

@@ -12,7 +12,7 @@ do_install:append() {
 
 }
 
-do_configure:append_mx6ull() {
+do_configure:append:mx6ull() {
 
     echo export QT_QUICK_BACKEND=software >> ${WORKDIR}/profile_d_qtenv.sh
 }

recipes-graphics/mesa/mesa_%.bbappend

@@ -11,5 +11,5 @@ python () {
 }
 
 # Enable Etnaviv support, imx-drm is covered by kmsro
-PACKAGECONFIG:append:mx6-generic-bsp = " gallium kmsro etnaviv"
+PACKAGECONFIG:append:mx6 = " gallium kmsro etnaviv"
 

recipes-qt/qt-multi-screen-compositor/qt-multi-screen-compositor.bb

@@ -43,11 +43,11 @@ do_install () {
     fi
 }
 
-SRC_URI:append_mx8m = " \
+SRC_URI:append:mx8m-generic-bsp = " \
     file://kms.conf \
     "
 
-do_install:append_mx8m () {
+do_install:append:mx8m-generic-bsp () {
     install -d ${D}${sysconfdir}/
     install -m 0664 ${WORKDIR}/kms.conf ${D}${sysconfdir}/kms.conf
 }

recipes-seconorth/guf-show-demo/guf-show-demo.bb

@@ -43,7 +43,7 @@ VIDEO_DIR = "${datadir}/${PN}/assets"
 
 VIDEOFILE = "gf-corporate-video-en.mp4"
 
-do_configure:append:mx6ull-generic-bsp() {
+do_configure:append:mx6ull() {
 
 	sed -i ${WORKDIR}/guf-show-demo.service -e "/Environment.*wayland/a Environment=QT_QUICK_BACKEND=software"
 }