apalis-tk1-mainline: rename machine to apalis-tk1

Rename the  apalis-tk1-mainline machine to the now dropped
apalis-tk1 machine name.

Related-to: ELB-2733
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 0bf55088d1f34338dd04f83d6b90b7a72f6867de)

12 files changed, 28 insertions, 50 deletions

diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1.conf
index 16b3383..6fbc589 100644
--- a/conf/machine/apalis-tk1-mainline.conf
+++ b/conf/machine/apalis-tk1.conf
@@ -1,14 +1,14 @@
 #@TYPE: Machine
-#@NAME: Toradex Apalis TK1 Mainline
+#@NAME: Toradex Apalis TK1
 #@SOC: Tegra K1
-#@DESCRIPTION: Mainline Machine configuration for Toradex Apalis TK1 SOM
-#@MAINTAINER: Dominik Sliwa <dominik.sliwa@toradex.com>
+#@DESCRIPTION: Toradex Apalis TK1 SOM
+#@MAINTAINER: Marcel Ziswiler <marcel.ziswiler@toradex.com>
 
-MACHINE_NAME = "Apalis-TK1-Mainline"
+MACHINE_NAME = "Apalis-TK1"
 
 require conf/machine/include/soc-family.inc
 
-SOC_FAMILY = "tegra124m"
+SOC_FAMILY = "tegra124"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline"
 
@@ -54,22 +54,22 @@ UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}"
 
-PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1-mainline = "lxde-icon-theme"
-PREFERRED_PROVIDER_lxsession-lite_apalis-tk1-mainline = "lxsession"
+PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1 = "lxde-icon-theme"
+PREFERRED_PROVIDER_lxsession-lite_apalis-tk1 = "lxsession"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_VERSION_xserver-xorg_tegra124m = "99:1.20%"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
 
 GALLIUMDRIVERS_append_armv7a =",nouveau"
-XSERVER ?= "xserver-xorg \
-            mesa-driver-nouveau \
-            xf86-input-evdev \
-            xf86-input-keyboard \
-            xf86-input-mouse \
-            xf86-video-modesetting \
-           "
+XSERVER ?= " \
+    xserver-xorg \
+    mesa-driver-nouveau \
+    xf86-input-evdev \
+    xf86-input-keyboard \
+    xf86-input-mouse \
+    xf86-video-modesetting \
+"
 
 MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci "
 MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw"
diff --git a/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
index 556a40e..556a40e 100644
--- a/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
+++ b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
diff --git a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg
index b9d203c..b9d203c 100644
--- a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg
+++ b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg
diff --git a/recipes-bsp/u-boot/files/tegra124m/fw_env.config b/recipes-bsp/u-boot/files/tegra124/fw_env.config
index 5941da2..5941da2 100644
--- a/recipes-bsp/u-boot/files/tegra124m/fw_env.config
+++ b/recipes-bsp/u-boot/files/tegra124/fw_env.config
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb
index f968dbf..af6c461 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb
@@ -43,10 +43,6 @@ do_install_append_tegra124() {
     install_unlock_emmc
 }
 
-do_install_append_tegra124m() {
-    install_unlock_emmc
-}
-
 do_install_class-cross () {
     install -d ${D}${bindir_cross}
     install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
diff --git a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb
index 9d156b0..5385b20 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb
@@ -4,7 +4,6 @@ require recipes-bsp/u-boot/u-boot-toradex-initial-env.inc
 
 DEPENDS += "bc-native dtc-native"
 DEPENDS_append_apalis-tk1 = " cbootimage-native"
-DEPENDS_append_apalis-tk1-mainline = " cbootimage-native"
 
 COMPATIBLE_MACHINE = "(apalis-tk1)"
 
@@ -12,10 +11,6 @@ SRC_URI_append_apalis-tk1 = " \
     file://apalis-tk1.img.cfg \
     file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \
 "
-SRC_URI_append_apalis-tk1-mainline = " \
-    file://apalis-tk1.img.cfg \
-    file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \
-"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -25,10 +20,4 @@ do_deploy_append_apalis-tk1() {
     cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img
     rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
 }
-do_deploy_append_apalis-tk1-mainline() {
-    cd ${DEPLOYDIR}
-    cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct .
-    cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img
-    rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
-}
 
diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend
index 556cd85..f6e2376 100644
--- a/recipes-graphics/drm/libdrm_%.bbappend
+++ b/recipes-graphics/drm/libdrm_%.bbappend
@@ -1,4 +1,4 @@
 PACKAGES += " ${PN}-tegra"
 FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*"
 
-PACKAGECONFIG_append_tegra124m = " tegra"
+PACKAGECONFIG_append_tegra124 = " tegra"
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 6521e73..1f384c1 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_apalis-tk1-mainline = " glut"
+PACKAGECONFIG_append_apalis-tk1 = " glut"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 7b44575..f2f791c 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,10 +1,6 @@
-#####
-## Tegra TK1 mainline kernel
+PACKAGECONFIG_append_tegra124 = " dri3 egl gles gallium gbm "
+EXTRA_OECONF_append_tegra124 = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug"
+DRIDRIVERS_tegra124 = " "
+GALLIUMDRIVERS_tegra124 = "nouveau,tegra"
 
-PACKAGECONFIG_append_tegra124m = " dri3 egl gles gallium gbm "
-EXTRA_OECONF_append_tegra124m = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug"
-DRIDRIVERS_tegra124m = " "
-GALLIUMDRIVERS_tegra124m = "nouveau,tegra"
-
-PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}"
-PE_tegra124m = "99"
+PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
index e33bf18..66e0628 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
@@ -1,8 +1,5 @@
-# always latest and greatest.
-PE_tegra124m = "99"
+COMPATIBLE_MACHINE_tegra124 = "(tegra124)"
 
-PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE_tegra124m = "(apalis-tk1-mainline)"
-
-PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} "
+PACKAGECONFIG_tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} "
diff --git a/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch b/recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch
index ce18242..ce18242 100644
--- a/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch
+++ b/recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 4908618..c03a336 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend_tegra124m := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_tegra124 := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}"
 
-SRC_URI_append_tegra124m = " file://0001-alsa-conf-select-default-soundcard.patch"
+SRC_URI_append_tegra124 = " file://0001-alsa-conf-select-default-soundcard.patch"