Use qdbd instead of adbd by default

Start qdbd by default instead of adbd. Changing to adbd can be done with
`systemctl enable --now adbd`.

qdbd needs Function FS, so update the comments related to those kernel
config changes.

Change-Id: I990a25f26141afe751555f5dc49f0304949dd9a6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

6 files changed, 6 insertions, 6 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
index 9a50c92..981a692 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -31,7 +31,7 @@
 RDEPENDS_kernel-base = ""
 
 do_preconfigure_prepend() {
-    # FunctionFS for adb
+    # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index 208ec74..47fd1bf 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -31,7 +31,7 @@
 RDEPENDS_kernel-base = ""
 
 do_preconfigure_prepend() {
-    # FunctionFS for adb
+    # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index 58c64de..492bea8 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -31,6 +31,6 @@
 RDEPENDS_kernel-base = ""
 
 do_preconfigure_prepend () {
-    # FunctionFS for adb
+    # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 431005b..0bc8dd6 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -30,7 +30,7 @@
 RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
 
 do_preconfigure_prepend () {
-    # FunctionFS for adb
+    # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
     echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
 }
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb
index 925b41c..963d22d 100644
--- a/recipes-qt/b2qt-addons/qdbd.bb
+++ b/recipes-qt/b2qt-addons/qdbd.bb
@@ -67,7 +67,5 @@ do_install_append() {
 }
 
 SYSTEMD_SERVICE_${PN} = "qdbd.service"
-# adbd is started by default instead of qdbd
-SYSTEMD_AUTO_ENABLE = "disable"
 
 inherit systemd
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 6e6fa1b..7bada5d 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -81,5 +81,7 @@ INITSCRIPT_NAME = "adb-init"
 INITSCRIPT_PARAMS = "defaults 96"
 
 SYSTEMD_SERVICE_${PN} = "adbd.service"
+# qdbd is started by default instead of adbd
+SYSTEMD_AUTO_ENABLE = "disable"
 
 inherit update-rc.d systemd