Fix placement of SPL and U-Boot environment

fwup.conf

@@ -48,21 +48,21 @@ define(ROOTFS, "${NERVES_SYSTEM}/images/rootfs.squashfs")
 # +----------------------------+
 
 # The SPL is written directly to the SDCard/eMMC. It is not in any partition.
-define(SPL_OFFSET, 2048)
+define(SPL_OFFSET, 16)
 define(SPL_COUNT, 64) # 32 KB
 
 # The U-Boot environment is written directly to the SDCard/eMMC. It is not in
 # any partition
-define(UBOOT_ENV_OFFSET, 4096)
+define-eval(UBOOT_ENV_OFFSET, "${SPL_OFFSET} + ${SPL_COUNT}")
 define(UBOOT_ENV_COUNT, 2048)  # 1 MB
 
 # The boot partition contains Image, sun50i-h5-nanopi-neo2.dtb and boot.scr
-define(BOOT_PART_OFFSET, 8192)
+define(BOOT_PART_OFFSET, 4096)
 define(BOOT_PART_COUNT, 131072) # 64 MB
 
 # Let the rootfs have room to grow up to 140 MiB and align it to the nearest 1
 # MB boundary
-define(ROOTFS_A_PART_OFFSET, 139264)
+define(ROOTFS_A_PART_OFFSET, 135168)
 define(ROOTFS_A_PART_COUNT, 286720)
 
 # Application partition. This partition will occupy all of the remaining space