merge upstream nerves.

Author: connor rigby

README.md

@@ -19,32 +19,16 @@ This is the base Nerves System configuration for the Raspberry Pi 3 Model B.
 | UART                 | 1 available - ttyS0             |
 | Camera               | Yes - via rpi-userland          |
 | Ethernet             | Yes                             |
-| WiFi                 | Yes - Nerves.InterimWiFi        |
-| Bluetooth            | Not yet                         |
+| WiFi                 | Yes - Nerves.Network            |
+| Bluetooth            | Not supported yet               |
 
-## Installation
-
-If [available in Hex](https://hex.pm/docs/publish), the package can be installed as:
-
-  1. Add nerves_system_farmbot_rpi3 to your list of dependencies in `mix.exs`:
-
-        def deps do
-          [{:nerves_system_farmbot_rpi3, "~> 0.11.0"}]
-        end
-
-  2. Ensure nerves_system_farmbot_rpi3 is started before your application:
-
-        def application do
-          [applications: [:nerves_system_farmbot_rpi3]]
-        end
-
-## Built-in WiFi Firmware
+## Supported WiFi devices and firmware
 
 WiFi modules almost always require proprietary firmware to be loaded for them to work. The
 Linux kernel handles this and firmware blobs are maintained in the
 `linux-firmware` project. The firmware for the built-in WiFi module on the RPi3
 hasn't made it to the `linux-firmware` project nor Buildroot, so it is included
-here in a `rootfs-additions` overlay directory. The original firmware files came from
+here in a `rootfs_overlay` overlay directory. The original firmware files came from
 https://github.com/RPi-Distro/firmware-nonfree/blob/master/brcm80211/brcm.
 
 [Image credit](#fritzing): This image is from the [Fritzing](http://fritzing.org/home/) parts library.

fwup.conf

@@ -44,7 +44,7 @@ define(ROOTFS, "${NERVES_SYSTEM}/images/rootfs.squashfs")
 # +----------------------------+
 # | p1*: Rootfs B (squashfs)   |
 # +----------------------------+
-# | p2: Application (ext4)    |
+# | p2: Application (ext4)     |
 # +----------------------------+
 #
 # The p0/p1 partition points to whichever of configurations A or B that is
@@ -231,6 +231,10 @@ task upgrade.a {
     # This task upgrades the A partition
     require-partition-offset(1, ${ROOTFS_B_PART_OFFSET})
 
+    # Verify the expected platform/architecture
+    require-uboot-variable(uboot-env, "b.nerves_fw_platform", "${NERVES_FW_PLATFORM}")
+    require-uboot-variable(uboot-env, "b.nerves_fw_architecture", "${NERVES_FW_ARCHITECTURE}")
+
     on-init {
         info("Upgrading the A partition")
 
@@ -242,6 +246,9 @@ task upgrade.a {
         fat_mkfs(${BOOT_A_PART_OFFSET}, ${BOOT_A_PART_COUNT})
         fat_setlabel(${BOOT_A_PART_OFFSET}, "BOOT-A")
         fat_mkdir(${BOOT_A_PART_OFFSET}, "overlays")
+
+        # Indicate that the entire partition can be cleared
+        trim(${ROOTFS_A_PART_OFFSET}, ${ROOTFS_A_PART_COUNT})
     }
 
     # Write the new boot partition files and rootfs. The MBR still points
@@ -284,6 +291,10 @@ task upgrade.b {
     # This task upgrades the B partition
     require-partition-offset(1, ${ROOTFS_A_PART_OFFSET})
 
+    # Verify the expected platform/architecture
+    require-uboot-variable(uboot-env, "a.nerves_fw_platform", "${NERVES_FW_PLATFORM}")
+    require-uboot-variable(uboot-env, "a.nerves_fw_architecture", "${NERVES_FW_ARCHITECTURE}")
+
     on-init {
         info("Upgrading the B partition")
 
@@ -295,6 +306,8 @@ task upgrade.b {
         fat_mkfs(${BOOT_B_PART_OFFSET}, ${BOOT_B_PART_COUNT})
         fat_setlabel(${BOOT_B_PART_OFFSET}, "BOOT-B")
         fat_mkdir(${BOOT_B_PART_OFFSET}, "overlays")
+
+        trim(${ROOTFS_B_PART_OFFSET}, ${ROOTFS_B_PART_COUNT})
     }
 
     # Write the new boot partition files and rootfs. The MBR still points
@@ -331,10 +344,18 @@ task upgrade.b {
 
     on-error {
     }
-    }
+}
 
 task upgrade.unexpected {
+    require-uboot-variable(uboot-env, "a.nerves_fw_platform", "${NERVES_FW_PLATFORM}")
+    require-uboot-variable(uboot-env, "a.nerves_fw_architecture", "${NERVES_FW_ARCHITECTURE}")
     on-init {
         error("Please check the media being upgraded. It doesn't look like either the A or B partitions are active.")
     }
 }
+
+task upgrade.wrongplatform {
+    on-init {
+        error("Expecting platform=${NERVES_FW_PLATFORM} and architecture=${NERVES_FW_ARCHITECTURE}")
+    }
+}

nerves_defconfig

@@ -1,6 +1,7 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
+BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y