Add touch screen support + Linux 4.1

- Adds very basic touch screen input as mouse support
- When using touch screen tap can activate NOOBS as alternative to shift
- When using touch screen treat long press as double click
- Update firmware
- Update Linux kernel to 4.1
- Use device tree files
- Firmware load workaround
- Only wait 2.1 seconds for keyboard to appear when there is no touch screen

Author: maxnet

BUILDME.sh

@@ -120,9 +120,9 @@ for i in $*; do
         update_github_package_version rpi-userland raspberrypi/userland master
     fi
 
-    # Update raspberrypi/linux rpi-3.18.y HEAD version in buildroot/.config to latest
+    # Update raspberrypi/linux rpi-4.1.y HEAD version in buildroot/.config to latest
     if [ $i = "update-kernel" ]; then
-        update_github_kernel_version raspberrypi/linux rpi-3.18.y
+        update_github_kernel_version raspberrypi/linux rpi-4.1.y
     fi
 
     # Option to build just recovery without completely rebuilding both kernels
@@ -150,13 +150,13 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
     select_kernelconfig armv7
     make linux-reconfigure
     # copy ARMv7 kernel
-    cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery7.img"
+    package/rpi-firmware/mkknlimg "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery7.img"
 
     # Rebuild kernel for ARMv6
     select_kernelconfig armv6
     make linux-reconfigure
     # copy ARMv6 kernel
-    cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery.img"
+    package/rpi-firmware/mkknlimg "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery.img"
 else
     echo "Warning: kernels in '$NOOBS_OUTPUT_DIR' directory haven't been updated"
 fi
@@ -168,6 +168,7 @@ cp "$IMAGES_DIR/rootfs.squashfs" "$FINAL_OUTPUT_DIR/recovery.rfs"
 # Ensure that final output dir contains files necessary to boot
 cp "$IMAGES_DIR/rpi-firmware/start.elf" "$FINAL_OUTPUT_DIR/recovery.elf"
 cp "$IMAGES_DIR/rpi-firmware/bootcode.bin" "$FINAL_OUTPUT_DIR"
+cp -a $IMAGES_DIR/rpi-firmware/*.dtb "$IMAGES_DIR/rpi-firmware/overlays" "$FINAL_OUTPUT_DIR"
 cp "$IMAGES_DIR/cmdline.txt" "$FINAL_OUTPUT_DIR/recovery.cmdline"
 touch "$FINAL_OUTPUT_DIR/RECOVERY_FILES_DO_NOT_EDIT"
 
@@ -178,7 +179,7 @@ echo "NOOBS Version: $(git describe)" >> "$BUILD_INFO"
 echo "NOOBS Git HEAD @ $(git rev-parse --verify HEAD)" >> "$BUILD_INFO"
 echo "rpi-userland Git master @ $(get_package_version rpi-userland)" >> "$BUILD_INFO"
 echo "rpi-firmware Git master @ $(get_package_version rpi-firmware)" >> "$BUILD_INFO"
-echo "rpi-linux Git rpi-3.18.y @ $(get_kernel_version)" >> "$BUILD_INFO"
+echo "rpi-linux Git rpi-4.1.y @ $(get_kernel_version)" >> "$BUILD_INFO"
 
 cd ..
 

buildroot/.config

@@ -307,8 +307,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
 # BR2_LINUX_KERNEL_CUSTOM_HG is not set
 # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b630db9dcb5c73367050a672823047b0466b16b9"
-BR2_LINUX_KERNEL_VERSION="b630db9dcb5c73367050a672823047b0466b16b9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="0aa6fa69a7874060590c8cb4fabdb9a222501a08"
+BR2_LINUX_KERNEL_VERSION="0aa6fa69a7874060590c8cb4fabdb9a222501a08"
 BR2_LINUX_KERNEL_PATCH=""
 # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -685,7 +685,7 @@ BR2_PACKAGE_QT_GFX_VNC=y
 #
 BR2_PACKAGE_QT_MOUSE_PC=y
 # BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QT_MOUSE_LINUXINPUT is not set
+BR2_PACKAGE_QT_MOUSE_LINUXINPUT=y
 # BR2_PACKAGE_QT_MOUSE_TSLIB is not set
 # BR2_PACKAGE_QT_MOUSE_QVFB is not set
 
@@ -827,7 +827,12 @@ BR2_PACKAGE_RPI_FIRMWARE=y
 # BR2_PACKAGE_RPI_FIRMWARE_X is not set
 BR2_PACKAGE_RPI_FIRMWARE_CD=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOT="_cd"
-# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS is not set
+BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS=y
+BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
+
+#
+# vcdbg needs an (e)glibc toolchain w/ C++
+#
 # BR2_PACKAGE_SUNXI_BOARDS is not set
 # BR2_PACKAGE_UX500_FIRMWARE is not set
 # BR2_PACKAGE_ZD1211_FIRMWARE is not set

buildroot/kernelconfig-recovery.armv6

@@ -1,6 +1,7 @@
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_PHYS_OFFSET=0
 CONFIG_LOCALVERSION="-rescue"
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
@@ -10,13 +11,13 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_GZIP is not set
 CONFIG_RD_LZO=y
 CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_BCM2708=y
+CONFIG_BCM2708_DT=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_CMA=y
@@ -67,6 +68,8 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_RPI_FT5406=y
 # CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
@@ -103,14 +106,25 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_SDHOST=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2708=y
+CONFIG_MAILBOX=y
+CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_EXT4_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FUSE_FS=y

buildroot/kernelconfig-recovery.armv7

@@ -1,4 +1,5 @@
 CONFIG_LOCALVERSION="-rescue-v7"
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
@@ -8,14 +9,14 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_GZIP is not set
 CONFIG_RD_LZO=y
 CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_BCM2709=y
 # CONFIG_ARM_THUMB is not set
+CONFIG_BCM2709_DT=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
@@ -72,6 +73,8 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_RPI_FT5406=y
 # CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
@@ -108,14 +111,25 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_SDHOST=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2708=y
+CONFIG_MAILBOX=y
+CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_EXT4_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FUSE_FS=y

buildroot/package/recovery/init

@@ -11,6 +11,18 @@
 /bin/hostname -F /etc/hostname
 /bin/mount -t tmpfs tmpfs /tmp
 
+# Newer kernel versions can load firmware from /lib/firmware by themselves without help
+# However that can fail during boot due to our initrd ramdisk not being mounted in time
+# Retry any pending requests
+(cd /sys/class/firmware
+for F in *; do
+    if [ -d "$F" ]; then
+        echo 1 > "$F/loading"
+        cat "/lib/firmware/${F/!//}" > "$F/data"
+        echo 0 > "$F/loading"
+    fi
+done)
+
 # Set up ACT LED to be triggered by mmc0
 echo mmc0 > /sys/class/leds/led0/trigger
 
@@ -32,6 +44,11 @@ fi
 # Mouse acceleration
 #export QWS_MOUSE_PROTO=:accel=1
 
+# Pi touch screen
+if [ -e /sys/devices/platform/rpi_ft5406 ]; then
+    export QWS_MOUSE_PROTO="linuxinput:/dev/input/event0:grab=1 intellimouse:/dev/input/mice"
+fi
+
 SAFE_MODE=`vcgencmd get_config safe_mode_gpio`
 
 if ( [ ${SAFE_MODE#*=} -eq 1 ] && ! grep -q disablesafemode /proc/cmdline ) || grep -q rescueshell /proc/cmdline; then

buildroot/package/rpi-firmware/Config.in

@@ -47,13 +47,33 @@ config BR2_PACKAGE_RPI_FIRMWARE_BOOT
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS
 	bool "Install Device Tree Blobs (DTBs)"
+	depends on !BR2_LINUX_KERNEL_DTS_SUPPORT
+	default y
 	help
-	  Say 'y' here if you want to boot your kernel that has support
-	  for the device tree.
+	  If you are using a Linux kernel <= 3.18, you should say 'y' here.
 
-	  Note that the defconfig files in the Raspberry Pi fork of the
-	  Linux kernel do not enable support for the Device Tree. You'll
-	  have to provide your own Linux config or defconfig file with
-	  device tree enabled, to make use of those DTBs.
+	  If you are using a Linux kernel >= 3.19, you should say 'n' here,
+	  and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build
+	  the DTB.
+
+config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
+	bool "Install DTB overlays"
+	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
+		|| BR2_LINUX_KERNEL_DTS_SUPPORT
+	default y
+	help
+	  Say 'y' here if you need to load one or more of the DTB overlays,
+	  to support HATs (Hardware Attached on Top, add-on modules).
+
+config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
+	bool "vcdbg"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
+	select BR2_PACKAGE_RPI_USERLAND
+	help
+	  Install vcdbg, to help debug communication with the GPU.
+
+comment "vcdbg needs an (e)glibc toolchain w/ C++"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
 
 endif # BR2_PACKAGE_RPI_FIRMWARE

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,15 +4,37 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 8aca5762f984f6decbeda294cee8418966c3d8d3
+RPI_FIRMWARE_VERSION = 591b25a7749027ce095a49d0a515294491dd26fc
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 RPI_FIRMWARE_INSTALL_TARGET = NO
 RPI_FIRMWARE_INSTALL_IMAGES = YES
 
-# Took out the INSTALL_DTBS parts because it adds a second RPI_FIRMWARE_VERSION
-# variable which confuses the version-related functions in BUILDME.sh
+RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware
+
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y)
+define RPI_FIRMWARE_INSTALL_DTB
+	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb
+	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb
+	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y)
+define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
+	for ovldtb in  $(@D)/boot/overlays/*.dtb; do \
+		$(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \
+	done
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y)
+define RPI_FIRMWARE_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0700 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/bin/vcdbg \
+		$(TARGET_DIR)/usr/sbin/vcdbg
+endef
+endif # INSTALL_VCDBG
 
 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
@@ -21,6 +43,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
 	$(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
 	$(RPI_FIRMWARE_INSTALL_DTB)
+	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS)
 endef
 
 # We have no host sources to get, since we already

recovery/keydetection.cpp

@@ -8,6 +8,8 @@
 #include <fcntl.h>
 #include <QDebug>
 #include <QDir>
+#include <QSet>
+#include <QTime>
 
 /* Key detection class
  *
@@ -30,18 +32,20 @@
 bool KeyDetection::waitForKeyboard()
 {
     int fd = -1;
+    QTime t;
 
     // Wait up to 2.1 seconds for a keyboard to appear.
-    for (int i=0; i<21; i++)
+    t.start();
+    do
     {
-        usleep(100000);
+        usleep(10000);
         fd = openKeyboard();
         if (fd != -1)
         {
             close(fd);
             return true;
         }
-    }
+    } while (t.elapsed() < 2100);
 
     return false;
 }
@@ -93,15 +97,18 @@ bool KeyDetection::_isF10pressed(int fd)
 
 int KeyDetection::openKeyboard()
 {
+    static QSet<QString> notKeyboards;
     int fd;
     u_int8_t evtype_bitmask[EV_MAX/8+1] = {0};
     QDir dir("/sys/class/input", "event*");
     QStringList inputDevices = dir.entryList();
 
     foreach (QString inputDevice, inputDevices)
     {
+        if (notKeyboards.contains(inputDevice))
+            continue;
+
         QByteArray inputDeviceFile = "/dev/input/"+inputDevice.toLatin1();
-        qDebug() << "Testing if input device is a keyboard" << inputDeviceFile;
         fd = open(inputDeviceFile.constData(), O_RDONLY);
 
         if (ioctl(fd, EVIOCGBIT(0, EV_MAX), evtype_bitmask) != -1
@@ -113,6 +120,10 @@ int KeyDetection::openKeyboard()
             qDebug() << "Keyboard found:" << inputDeviceFile;
             return fd;
         }
+        else
+        {
+            notKeyboards.insert(inputDevice);
+        }
 
         close(fd);
     }