diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-28 08:45:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-28 08:45:00 -0400 |
| commit | 4711e7f7af839b41a6d78490257a9e7975494dd3 (patch) | |
| tree | 7fb01e8da7cee537ebd1a070c750da7c4cc43482 /arch/arm/cpu/armv7/mx7 | |
| parent | fe34b6a4845476208ca7d19a35179e56bebf3877 (diff) | |
| parent | 77cbd3a14184c61d55d7fcddd88fa4e96efc9901 (diff) | |
| download | u-boot-4711e7f7af839b41a6d78490257a9e7975494dd3.zip u-boot-4711e7f7af839b41a6d78490257a9e7975494dd3.tar.gz u-boot-4711e7f7af839b41a6d78490257a9e7975494dd3.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/armv7/mx7')
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/soc.c | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index ecfa4a2..5fdc8dd 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -3,6 +3,8 @@ if ARCH_MX7 config MX7 bool select ROM_UNIFIED_SECTIONS + select CPU_V7_HAS_VIRT + select CPU_V7_HAS_NONSEC default y config MX7D @@ -25,12 +27,19 @@ config TARGET_WARP7 select DM select DM_THERMAL +config TARGET_COLIBRI_IMX7 + bool "Support Colibri iMX7S/iMX7D modules" + select DM + select DM_SERIAL + select DM_THERMAL + endchoice config SYS_SOC default "mx7" source "board/freescale/mx7dsabresd/Kconfig" +source "board/toradex/colibri_imx7/Kconfig" source "board/warp7/Kconfig" endif diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c index ef46c92..dead1d3 100644 --- a/arch/arm/cpu/armv7/mx7/soc.c +++ b/arch/arm/cpu/armv7/mx7/soc.c @@ -248,6 +248,20 @@ int arch_cpu_init(void) return 0; } +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init(void) +{ +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + if (is_mx7d()) + setenv("soc", "imx7d"); + else + setenv("soc", "imx7s"); +#endif + + return 0; +} +#endif + #ifdef CONFIG_SERIAL_TAG void get_board_serial(struct tag_serialnr *serialnr) { |