Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 74b19ad1c180fe32a01bccc35b0be1425132d927

Authored by Marcel Ziswiler
Committed by Tom Rini
1 parent b891d01038
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

apalis/colibri_t30: move environment location 

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>

Showing 2 changed files with 8 additions and 6 deletions Side-by-side Diff

include/configs/apalis_t30.h
Diff comments   View file @ 74b19ad
... ... @@ -32,11 +32,12 @@
32 32 #define CONFIG_GENERIC_MMC
33 33 #define CONFIG_TEGRA_MMC
34 34  
35   -/* Environment in eMMC, at the end of 2nd "boot sector" */
  35 +/* Environment in eMMC, before config block at the end of 1st "boot sector" */
36 36 #define CONFIG_ENV_IS_IN_MMC
37   -#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
  37 +#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
  38 + CONFIG_TDX_CFG_BLOCK_OFFSET)
38 39 #define CONFIG_SYS_MMC_ENV_DEV 0
39   -#define CONFIG_SYS_MMC_ENV_PART 2
  40 +#define CONFIG_SYS_MMC_ENV_PART 1
40 41  
41 42 /* USB host support */
42 43 #define CONFIG_USB_EHCI
include/configs/colibri_t30.h
Diff comments   View file @ 74b19ad
... ... @@ -32,11 +32,12 @@
32 32 #define CONFIG_GENERIC_MMC
33 33 #define CONFIG_TEGRA_MMC
34 34  
35   -/* Environment in eMMC, at the end of 2nd "boot sector" */
  35 +/* Environment in eMMC, before config block at the end of 1st "boot sector" */
36 36 #define CONFIG_ENV_IS_IN_MMC
37   -#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
  37 +#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
  38 + CONFIG_TDX_CFG_BLOCK_OFFSET)
38 39 #define CONFIG_SYS_MMC_ENV_DEV 0
39   -#define CONFIG_SYS_MMC_ENV_PART 2
  40 +#define CONFIG_SYS_MMC_ENV_PART 1
40 41  
41 42 /* USB host support */
42 43 #define CONFIG_USB_EHCI