Include Android Debug Bridge Daemon (adbd) to images

Change-Id: I00108d36be95e42b8aa9674d1a86ea7e3a5bcf55
Reviewed-by: Rainer Keller <rainer.keller@digia.com>

2 files changed, 9 insertions, 2 deletions

diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend
index fff9f24..6d30629 100644
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ b/recipes/linux/linux-boundary_3.0.35.bbappend
@@ -3,4 +3,7 @@ do_configure_prepend() {
         # Use multitouch protocol for touchscreen that support it
         echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
         echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 }
diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend
index 0cfda85..1e979da 100644
--- a/recipes/linux/linux-mainline_3.2.bbappend
+++ b/recipes/linux/linux-mainline_3.2.bbappend
@@ -1,7 +1,11 @@
-
 do_configure_prepend() {
         # Builtin network driver, so networking is initialized correctly during boot
-        echo "CONFIG_USB_NET_SMSC95XX=y"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_NET_SMSC95XX=y"        >> ${WORKDIR}/defconfig
+
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS_ETH=n"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_FUNCTIONFS_RNDIS=n"    >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_FUNCTIONFS_GENERIC=y"  >> ${WORKDIR}/defconfig
 
         # Remove beagleboard logo
         if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then