summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-09-04 18:15:41 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2017-10-02 19:26:40 +0200
commit85edc1064eefd6b04184d3c35e25cd56fb6dbdb9 (patch)
tree052f49231628ad95418cb82949f35c601ac68b3d
parentcc1ec0477cfae3775d5ce26c4326fec4ad3f9578 (diff)
colibri_imx7_emmc: fix environment storage
Store U-Boot environment in eMMC, before config block at the end of 1st "boot sector". Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--include/configs/colibri_imx7_emmc.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h
index 873b8885fe..d33619fb72 100644
--- a/include/configs/colibri_imx7_emmc.h
+++ b/include/configs/colibri_imx7_emmc.h
@@ -177,18 +177,17 @@
/* FLASH and environment organization */
#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ENV_SIZE (8 * 1024)
+
#define CONFIG_ENV_IS_IN_MMC
#if defined(CONFIG_ENV_IS_IN_MMC)
+/* Environment in eMMC, before config block at the end of 1st "boot sector" */
+#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
+ CONFIG_TDX_CFG_BLOCK_OFFSET)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 1
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
-#define CONFIG_ENV_OFFSET (8 * SZ_64K)
-#define CONFIG_ENV_SIZE (8 * 1024)
-#elif defined(CONFIG_ENV_IS_IN_NAND)
-#define CONFIG_ENV_SECT_SIZE (128 * 1024)
-#define CONFIG_ENV_OFFSET (28 * CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#endif
/* USB Configs */