fixup! TRYBOOT WIP

Author: fhunleth

fwup-ops.conf

@@ -35,6 +35,7 @@ uboot-environment uboot-env {
 task factory-reset {
     on-init {
         info("Erasing all writable data")
+        # This works better with --enable-trim
         # Trim may not work on MicroSD card, so don't rely on it
         trim(${APP_PART_OFFSET}, ${APP_PART_COUNT})
         raw_memset(${APP_PART_OFFSET}, 256, 0xff)

fwup.conf

@@ -141,6 +141,7 @@ task complete {
         include("${NERVES_PROVISIONING}")
 
         uboot_setenv(uboot-env, "nerves_fw_active", "a")
+        uboot_setenv(uboot-env, "nerves_fw_validated", "1")
         uboot_setenv(uboot-env, "nerves_fw_devpath", ${NERVES_FW_DEVPATH})
         uboot_setenv(uboot-env, "a.nerves_fw_application_part0_devpath", ${NERVES_FW_APPLICATION_PART0_DEVPATH})
         uboot_setenv(uboot-env, "a.nerves_fw_application_part0_fstype", ${NERVES_FW_APPLICATION_PART0_FSTYPE})
@@ -279,14 +280,15 @@ task upgrade.a {
 
 	# Switch over to boot the new firmware
         uboot_setenv(uboot-env, "nerves_fw_active", "a")
+        uboot_setenv(uboot-env, "nerves_fw_validated", "0")
     }
 
     on-error {
     }
 }
 
 task upgrade.b {
-    # This task upgrades the A partition
+    # This task upgrades the B partition
     require-uboot-variable(uboot-env, "nerves_fw_active", "a")
 
     # Require that the running version of firmware has been validated.
@@ -362,6 +364,7 @@ task upgrade.b {
 
 	# Switch over to boot the new firmware
         uboot_setenv(uboot-env, "nerves_fw_active", "b")
+        uboot_setenv(uboot-env, "nerves_fw_validated", "0")
     }
 
     on-error {