diff options
author | Nitin Garg <nitin.garg@freescale.com> | 2014-05-27 17:59:14 -0500 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-06-13 10:17:00 -0500 |
commit | caf940dcc880b777365e35294ab757609fc9ac5a (patch) | |
tree | 7a5c6e0e84d1488cceae02ed117a1d631ea55540 /include/configs/mx6qarm2.h | |
parent | 624f876980209f9073e6fb834541efa89192d484 (diff) | |
download | u-boot-imx-caf940dcc880b777365e35294ab757609fc9ac5a.zip u-boot-imx-caf940dcc880b777365e35294ab757609fc9ac5a.tar.gz u-boot-imx-caf940dcc880b777365e35294ab757609fc9ac5a.tar.bz2 |
ENGR00315499-11 ARM:imx6 Change static environment SD/MMC storage to dynamic
imx6 boards (sabresd, sabreauto, arm2 and slevk) have multiple SD/MMC ports to boot.
But current uboot hard code the SD/MMC port for environment variables storage. So
if customer changes a port without modifying the configuration "CONFIG_SYS_MMC_ENV_DEV",
error will issue at saving and loading environment.
Implement a mechanism to detect SD/MMC port from SRC SMBR register, and override the
default "mmc_get_env_devno". The "board_late_mmc_env_init" is used to set "mmcdev"
when booting from SD/MMC port. Finally after booting from SD/MMC, the environment storage
device and "mmcdev" are both set to current SD/MMC port. Customers don't need to re-build
the image if booting from different SD/MMC port.
This patch also adds SD1 and SD3 support to imx6slevk BSP, and adds support for sabreauto
SD1 slot on base board.
Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Diffstat (limited to 'include/configs/mx6qarm2.h')
-rw-r--r-- | include/configs/mx6qarm2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index fd651cf..66b48ba 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -27,6 +27,7 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_LATE_INIT #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART @@ -146,7 +147,7 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_OFFSET (6 * 64 * 1024) +#define CONFIG_ENV_OFFSET (8 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 |