u-boot: bump to 2018.07

This updates U-Boot to 2018.07, applies the SquashFS patch, bb.org
patches, and our MMC environment patch.

The kernel is still on the FAT filesystem due to the poor Squashfs load
performance.

Author: fhunleth

fwup.conf

@@ -40,6 +40,7 @@ define(ROOTFS, "${NERVES_SYSTEM}/images/rootfs.squashfs")
 # | p0*: Boot A (FAT32)        |
 # | u-boot.img                 |
 # | uenv.txt (not supported)   |
+# | zImage                     |
 # +----------------------------+
 # | p0*: Boot B (FAT32)        |
 # +----------------------------+
@@ -106,6 +107,9 @@ file-resource u-boot.img {
 file-resource uboot-env.bin {
     host-path = "${NERVES_SYSTEM}/images/uboot-env.bin"
 }
+file-resource zImage {
+    host-path = "${NERVES_SYSTEM}/images/zImage"
+}
 file-resource rootfs.img {
     host-path = ${ROOTFS}
 
@@ -198,6 +202,7 @@ task complete {
 
     on-resource MLO { fat_write(${BOOT_A_PART_OFFSET}, "MLO") }
     on-resource u-boot.img { fat_write(${BOOT_A_PART_OFFSET}, "u-boot.img") }
+    on-resource zImage { fat_write(${BOOT_A_PART_OFFSET}, "zImage") }
 
     on-resource rootfs.img {
         # write to the first rootfs partition
@@ -251,6 +256,7 @@ task upgrade.a {
     # won't hurt anything.
     on-resource MLO { fat_write(${BOOT_A_PART_OFFSET}, "MLO") }
     on-resource u-boot.img { fat_write(${BOOT_A_PART_OFFSET}, "u-boot.img") }
+    on-resource zImage { fat_write(${BOOT_A_PART_OFFSET}, "zImage") }
     on-resource rootfs.img { raw_write(${ROOTFS_A_PART_OFFSET}) }
 
     on-finish {
@@ -307,6 +313,7 @@ task upgrade.b {
     # won't hurt anything.
     on-resource MLO { fat_write(${BOOT_B_PART_OFFSET}, "MLO") }
     on-resource u-boot.img { fat_write(${BOOT_B_PART_OFFSET}, "u-boot.img") }
+    on-resource zImage { fat_write(${BOOT_B_PART_OFFSET}, "zImage") }
     on-resource rootfs.img { raw_write(${ROOTFS_B_PART_OFFSET}) }
 
     on-finish {

nerves_defconfig

@@ -47,7 +47,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_PATCH="${NERVES_DEFCONFIG_DIR}/uboot"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/uboot/uboot.defconfig"

post-build.sh

@@ -37,3 +37,10 @@ $HOST_DIR/usr/bin/fwup -c -f $NERVES_DEFCONFIG_DIR/fwup-revert.conf -o $TARGET_D
 
 # Copy the fwup includes to the images dir
 cp -rf $NERVES_DEFCONFIG_DIR/fwup_include $BINARIES_DIR
+
+# Since U-Boot's squashfs support is so slow (sadly), store the Linux
+# kernel in the FAT filesystem instead of /boot. Everything else can
+# go in /boot since it's so small. See the fwup.conf for how the zImage
+# is put in the FAT filesystem. Remove zImage from /boot since we can't
+# tell Buildroot to just put the .dtb files there.
+rm -f $TARGET_DIR/boot/zImage