From 85edc1064eefd6b04184d3c35e25cd56fb6dbdb9 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 4 Sep 2017 18:15:41 +0200 Subject: 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 Acked-by: Max Krummenacher --- include/configs/colibri_imx7_emmc.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include/configs/colibri_imx7_emmc.h') 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 */ -- cgit v1.2.3