diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 (patch) | |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 /arch/arm/cpu/armv7 | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 (diff) | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d (diff) | |
| download | u-boot-821560fd8e43eecc208c1c52ad24faadb6b52703.tar.xz | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/Kconfig | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index dd94797..2bedbdb 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -158,7 +158,7 @@ u32 get_cpu_speed_grade_hz(void) * OCOTP_MEM0[7:6] (see Fusemap Description Table offset 0x480) * defines a 2-bit Temperature Grade * - * return temperature grade and min/max temperature in celcius + * return temperature grade and min/max temperature in Celsius */ #define OCOTP_MEM0_TEMP_SHIFT 6 diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index 80c1290..aea8526 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -25,6 +25,13 @@ config TARGET_MX7DSABRESD select DM select DM_THERMAL +config TARGET_PICO_IMX7D + bool "pico-imx7d" + select BOARD_LATE_INIT + select MX7D + select DM + select DM_THERMAL + config TARGET_WARP7 bool "warp7" select BOARD_LATE_INIT @@ -45,6 +52,7 @@ config SYS_SOC default "mx7" source "board/freescale/mx7dsabresd/Kconfig" +source "board/technexion/pico-imx7d/Kconfig" source "board/toradex/colibri_imx7/Kconfig" source "board/warp7/Kconfig" |