[U-Boot] [PATCH 3/3] tegra: put eMMC environment into the boot sectors

[Tom Warren]

Stephen,

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Monday, July 30, 2012 1:56 PM
> To: Tom Warren; Andy Fleming
> Cc: U-Boot Mailing List; Stephen Warren
> Subject: [PATCH 3/3] tegra: put eMMC environment into the boot sectors
> 
> From: Stephen Warren <swarren at nvidia.com>
> 
> When I set up Tegra's config files to put the environment into eMMC, I
> assumed that CONFIG_ENV_OFFSET was a linearized address relative to the
> start of the eMMC device, and spanning HW partitions boot0, boot1,
> general* and the user area in order. However, it turns out that the offset
> is actually relative to the beginning of the user area. Hence, the
> environment block ended up in a different location to expected and
> documented.
> 
> Set CONFIG_SYS_MMC_ENV_PART=2 (boot1) to solve this, and adjust
> CONFIG_ENV_OFFSET to be relative to the start of boot1, not the entire eMMC.
> 
> Signed-off-by: Stephen Warren <swarren at nvidia.com>

This patchset (including the env_mmc and mmc changes) applied to u-boot-tegra/next.

Thanks,

Tom
> ---
>  include/configs/paz00.h    |    3 ++-
>  include/configs/seaboard.h |    3 ++-
>  include/configs/ventana.h  |    3 ++-
>  include/configs/whistler.h |    3 ++-
>  4 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/include/configs/paz00.h b/include/configs/paz00.h index
> 0eb9f3b..99b8753 100644
> --- a/include/configs/paz00.h
> +++ b/include/configs/paz00.h
> @@ -51,8 +51,9 @@
> 
>  /* Environment in eMMC, at the end of 2nd "boot sector" */  #define
> CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 1024 * 1024) -
> CONFIG_ENV_SIZE)
> +#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
>  #define CONFIG_SYS_MMC_ENV_DEV 0
> +#define CONFIG_SYS_MMC_ENV_PART 2
> 
>  /* USB Host support */
>  #define CONFIG_USB_EHCI
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index
> 479af1a..6996502 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -77,8 +77,9 @@
> 
>  /* Environment in eMMC, at the end of 2nd "boot sector" */  #define
> CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 512 * 1024) -
> CONFIG_ENV_SIZE)
> +#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE)
>  #define CONFIG_SYS_MMC_ENV_DEV 0
> +#define CONFIG_SYS_MMC_ENV_PART 2
> 
>  /* USB Host support */
>  #define CONFIG_USB_EHCI
> diff --git a/include/configs/ventana.h b/include/configs/ventana.h index
> 25ec2eb..f5e1bf8 100644
> --- a/include/configs/ventana.h
> +++ b/include/configs/ventana.h
> @@ -58,8 +58,9 @@
> 
>  /* Environment in eMMC, at the end of 2nd "boot sector" */  #define
> CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 1024 * 1024) -
> CONFIG_ENV_SIZE)
> +#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
>  #define CONFIG_SYS_MMC_ENV_DEV 0
> +#define CONFIG_SYS_MMC_ENV_PART 2
> 
>  /* USB Host support */
>  #define CONFIG_USB_EHCI
> diff --git a/include/configs/whistler.h b/include/configs/whistler.h index
> b747d0e..3235718 100644
> --- a/include/configs/whistler.h
> +++ b/include/configs/whistler.h
> @@ -72,8 +72,9 @@
>   * particular card is standard practice as far as I know.
>   */
>  #define CONFIG_ENV_IS_IN_MMC
> -#define CONFIG_ENV_OFFSET ((2 * 512 * 1024) - CONFIG_ENV_SIZE)
> +#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE)
>  #define CONFIG_SYS_MMC_ENV_DEV 0
> +#define CONFIG_SYS_MMC_ENV_PART 2
> 
>  /* USB Host support */
>  #define CONFIG_USB_EHCI
> --
> 1.7.0.4
-- 
nvpublic