Support NOOBS on the Raspberry Pi 2

 * Automatically build linux kernels for both
   ARMv6 (recovery.img) and ARMv7 (recovery7.img)
 * Add script to run linux-menuconfig (or user-provided make target)
   for each arch
 * Enhanced supported-revision checking code
 * Enhanced reboot code

Author: lurch

BUILDME.sh

@@ -87,6 +87,15 @@ function update_github_kernel_version {
 }
 
 
+function select_kernelconfig {
+    ARCH=$1
+    CONFIG_FILE=.config
+    CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
+    VAR_PREFIX=kernelconfig-recovery
+    sed -ri "s/(^$CONFIG_VAR=\"$VAR_PREFIX\.).+(\")$/\1$ARCH\2/" "$CONFIG_FILE"
+}
+
+
 cd buildroot
 
 # WARNING: don't try changing these - you'll break buildroot
@@ -128,7 +137,20 @@ FINAL_OUTPUT_DIR="../$NOOBS_OUTPUT_DIR"
 mkdir -p "$FINAL_OUTPUT_DIR"
 mkdir -p "$FINAL_OUTPUT_DIR/os"
 cp -r ../sdcontent/* "$FINAL_OUTPUT_DIR"
+
+# Rebuild kernel for ARMv7
+select_kernelconfig armv7
+make linux-reconfigure
+# copy ARMv7 kernel
+cp "$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"
+
+# copy rootfs
 cp "$IMAGES_DIR/rootfs.cpio.lzo" "$FINAL_OUTPUT_DIR/recovery.rfs"
 
 # Ensure that final output dir contains files necessary to boot

buildroot/.config

@@ -312,7 +312,7 @@ BR2_LINUX_KERNEL_VERSION="c157458351071104eaa8afa7313f2f26afb499da"
 BR2_LINUX_KERNEL_PATCH=""
 # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="kernelconfig-recovery"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="kernelconfig-recovery.armv6"
 # BR2_LINUX_KERNEL_UIMAGE is not set
 # BR2_LINUX_KERNEL_APPENDED_UIMAGE is not set
 BR2_LINUX_KERNEL_ZIMAGE=y
@@ -628,7 +628,7 @@ BR2_PACKAGE_QT_GUI_MODULE=y
 #
 # BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set
 # BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set
-# BR2_PACKAGE_QT_PIXEL_DEPTH_8 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
 # BR2_PACKAGE_QT_PIXEL_DEPTH_12 is not set
 # BR2_PACKAGE_QT_PIXEL_DEPTH_15 is not set
 BR2_PACKAGE_QT_PIXEL_DEPTH_16=y

buildroot/kernelconfig-recovery buildroot/kernelconfig-recovery.armv6

@@ -0,0 +1,153 @@
+CONFIG_LOCALVERSION="-rescue-v7"
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+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_CACHE_L2X0 is not set
+CONFIG_SMP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_HOTPLUG_CPU=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_CMA=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_IDLE=y
+CONFIG_VFP=y
+# CONFIG_COREDUMP is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=5
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_NETDEVICES=y
+# CONFIG_ETHERNET is not set
+CONFIG_USB_USBNET=y
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+CONFIG_USB_NET_SMSC95XX=y
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_RAW_DRIVER=y
+CONFIG_BRCM_CHAR_DRIVERS=y
+CONFIG_BCM_VC_CMA=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_BCM2835=y
+CONFIG_FB=y
+CONFIG_FB_BCM2708=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_HIDRAW=y
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_EZKEY=y
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DWCOTG=y
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_BCM2835=y
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2708=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT4_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_FSCACHE=y
+CONFIG_CACHEFILES=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+CONFIG_NLS_ISO8859_3=y
+CONFIG_NLS_ISO8859_4=y
+CONFIG_NLS_ISO8859_5=y
+CONFIG_NLS_ISO8859_6=y
+CONFIG_NLS_ISO8859_7=y
+CONFIG_NLS_ISO8859_9=y
+CONFIG_NLS_ISO8859_13=y
+CONFIG_NLS_ISO8859_14=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set

buildroot/kernelconfig-recovery.armv7

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Bash script to run linux-menuconfig for a specific arch
+
+set -e
+
+ARCH=$1
+MAKECMD=${2:-"linux-menuconfig"}
+if [ -n "$ARCH" ]; then
+    if [ "$ARCH" != "armv6" ] && [ "$ARCH" != "armv7" ]; then
+        echo "ARCH must be armv6 or armv7">&2
+        exit 1
+    fi
+else
+    echo "Missing ARCH parameter">&2
+    exit 1
+fi
+
+
+function get_kernel_version {
+    CONFIG_FILE=.config
+    CONFIG_VAR=BR2_LINUX_KERNEL_VERSION
+    grep -E "^$CONFIG_VAR=\".+\"$" "$CONFIG_FILE" | tr -d '"' | cut -d= -f2
+}
+
+
+function select_kernelconfig {
+    ARCH=$1
+    CONFIG_FILE=.config
+    CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
+    VAR_PREFIX=kernelconfig-recovery
+    sed -ri "s/(^$CONFIG_VAR=\"$VAR_PREFIX\.).+(\")$/\1$ARCH\2/" "$CONFIG_FILE"
+}
+
+
+function get_kernelconfig {
+    CONFIG_FILE=.config
+    CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
+    VAR_PREFIX=kernelconfig-recovery
+    grep -E "^$CONFIG_VAR=\".+\"$" "$CONFIG_FILE" | tr -d '"' | cut -d= -f2 | sed "s/^$VAR_PREFIX\.//"
+}
+
+
+cd buildroot
+
+# Setup kernel for specific arch
+if [ "$(get_kernelconfig)" != "$ARCH" ]; then
+    select_kernelconfig $ARCH
+    KERNEL_BUILD_DIR=output/build/linux-$(get_kernel_version)
+    rm "$KERNEL_BUILD_DIR/.stamp_patched"
+    rm "$KERNEL_BUILD_DIR/.stamp_configured"
+fi
+
+# Run specific command
+make "$MAKECMD"
+

make_arch_linux-menuconfig.sh

@@ -363,12 +363,60 @@ bool isSupportedOs(const QString& name, const QVariantMap& values)
         return true;
     }
 
-    /* Check the feature_level flag */
-    quint64 featurelevel = values.value("feature_level", 58364).toULongLong();
-    quint64 mask = (quint64)1 << readBoardRevision();
-    if ((featurelevel & mask) != mask) {
+    uint board_revision = readBoardRevision();
+    if (values.find("supported_revisions") != values.end())
+    {
+        /* Check the supported revisions list */
+        QStringList revisions = values.value("supported_revisions").toString().remove(" ").split(",");
+        for (int i=0; i < revisions.size(); i++)
+        {
+            bool ok;
+            uint rev = revisions.at(i).toUInt(&ok, 10);
+            if (ok)
+            {
+                if ((rev & 0xffff) == (board_revision & 0xffff))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    else if (values.find("supported_hex_revisions") != values.end())
+    {
+        /* Check the supported revisions list */
+        QStringList revisions = values.value("supported_hex_revisions").toString().remove(" ").split(",");
+        for (int i=0; i < revisions.size(); i++)
+        {
+            bool ok;
+            uint rev = revisions.at(i).toUInt(&ok, 16);
+            if (ok)
+            {
+                if ((rev & 0xffff) == (board_revision & 0xffff))
+                {
+                    return true;
+                }
+            }
+        }
         return false;
     }
+    else
+    {
+        /* Check the feature_level flag */
+        if (board_revision < 64) /* overflow otherwise */
+        {
+            quint64 featurelevel = values.value("feature_level", 58364).toULongLong();
+            quint64 mask = (quint64)1 << board_revision;
+            if ((featurelevel & mask) != mask)
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+    }
 
     return true;
 }
@@ -486,7 +534,8 @@ void MainWindow::on_actionWrite_image_to_disk_triggered()
         {
             QVariantMap entry = item->data(Qt::UserRole).toMap();
             QString name = entry.value("name").toString();
-            if (!isSupportedOs(name, entry)) {
+            if (!isSupportedOs(name, entry))
+            {
                 allSupported = false;
                 unsupportedOses += "\n" + name;
             }

recovery/mainwindow.cpp

@@ -6,6 +6,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <QFile>
+#include <QFileInfo>
 #include <QProcess>
 #include <QDebug>
 #include <QList>
@@ -139,7 +140,17 @@ bool canBootOs(const QString& name, const QVariantMap& values)
     return true;
 }
 
-void setRebootPartition(QByteArray partition)
+bool setRebootPartition(QByteArray partition)
 {
-    putFileContents("/sys/module/bcm2708/parameters/reboot_part", partition+"\n");
+    if (QFileInfo("/sys/module/bcm2708/parameters/reboot_part").exists())
+    {
+        putFileContents("/sys/module/bcm2708/parameters/reboot_part", partition+"\n");
+        return true;
+    }
+    else if (QFileInfo("/sys/module/bcm2709/parameters/reboot_part").exists())
+    {
+        putFileContents("/sys/module/bcm2709/parameters/reboot_part", partition+"\n");
+        return true;
+    }
+    return false;
 }

recovery/util.cpp

@@ -20,5 +20,5 @@ void getOverscan(int &top, int &bottom, int &left, int &right);
 bool nameMatchesRiscOS(const QString &name);
 uint readBoardRevision();
 bool canBootOs(const QString& name, const QVariantMap& values);
-void setRebootPartition(QByteArray partition);
+bool setRebootPartition(QByteArray partition);
 #endif // UTIL_H