Now with the config block handling in place move the U-Boot environment location before the config block at the end of 1st "boot sector" as deployed during production using our downstream BSP.
Signed-off-by: Marcel Ziswiler marcel.ziswiler@toradex.com Acked-by: Max Krummenacher max.krummenacher@toradex.com
---
Changes in v5: None Changes in v4: - add various peoples acked- resp. reviewed-bys with which it now hopefully could be pulled in ASAP
Changes in v3: - drop patch 1 'colibri_imx7/vf: move to custom checkboard_fallback()' in favour of Stefan's proposed solution
Changes in v2: - fixed common.h include mess in board/toradex/common by renaming common* to tdx-common - renamed TRDX to TDX and trdx to tdx as in common use internally - consolidated makefiles and changed copyright message - renamed configblock* to tdx-cfg-block* analogous to Kconfig symbols - moved board/toradex/common/Kconfig sourcing from arch/arm/Kconfig into our own board Kconfig files - use a named choice for the config block location for above to work without issuing any warnings (undocumented kbuild feature curtsey Arnaud Lacombe) - added CUSTOM_BOARDINFO into our common Kconfig to avoid recent no_new_adhoc_configs_check error - add Max' patch colibri_vf: usb gadget: toradex pid is now set generically
include/configs/apalis_t30.h | 7 ++++--- include/configs/colibri_t30.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 069ed20..f2a24c1 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -32,11 +32,12 @@ #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC
-/* Environment in eMMC, at the end of 2nd "boot sector" */ +/* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) +#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 2 +#define CONFIG_SYS_MMC_ENV_PART 1
/* USB host support */ #define CONFIG_USB_EHCI diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 1ab5c41..e8b3f99 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -32,11 +32,12 @@ #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC
-/* Environment in eMMC, at the end of 2nd "boot sector" */ +/* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) +#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 2 +#define CONFIG_SYS_MMC_ENV_PART 1
/* USB host support */ #define CONFIG_USB_EHCI