===================================================================
@@ -218,9 +218,12 @@
done:
if (saved_data)
free(saved_data);
+
+#ifndef CONFIG_ENV_UNPROTECTED
/* try to re-protect */
flash_sect_protect(1, (ulong)flash_addr, end_addr);
flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new);
+#endif
return rc;
}
===================================================================
@@ -2294,7 +2294,7 @@
#endif
/* Environment protection ON by default */
-#ifdef CONFIG_ENV_IS_IN_FLASH
+#if defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_UNPROTECTED)
flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR,
CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,