diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-25 08:46:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-08 14:43:42 +0100 |
| commit | e73608ca3d7252f95f18c41039b35d658cc287b0 (patch) | |
| tree | fffb5b750c2d9fa657d5eea2c485d814a74994a3 /arch | |
| parent | ce864aa5a42895fc91b2bc8f5b83d63f844f50b1 (diff) | |
| download | barebox-e73608ca3d7252f95f18c41039b35d658cc287b0.tar.gz barebox-e73608ca3d7252f95f18c41039b35d658cc287b0.tar.xz | |
ARM: i.MX: beginning i.MX6ul support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx6.h | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a80bc6b986..b315f7d8c6 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -149,6 +149,10 @@ config ARCH_IMX6SX select OFTREE select COMMON_CLK_OF_PROVIDER +config ARCH_IMX6UL + bool + select ARCH_IMX6 + config IMX_MULTI_BOARDS bool "Allow multiple boards to be selected" select HAVE_DEFAULT_ENVIRONMENT_NEW diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index 5ab6afc9bf..1d3f18c28d 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -63,6 +63,8 @@ static int imx_soc_from_dt(void) return IMX_CPU_IMX6; if (of_machine_is_compatible("fsl,imx6qp")) return IMX_CPU_IMX6; + if (of_machine_is_compatible("fsl,imx6ul")) + return IMX_CPU_IMX6; return 0; } diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 18509a7b51..b24223064b 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -179,6 +179,9 @@ int imx6_init(void) case IMX6_CPUTYPE_IMX6SX: cputypestr = "i.MX6 SoloX"; break; + case IMX6_CPUTYPE_IMX6UL: + cputypestr = "i.MX6 UltraLite"; + break; default: cputypestr = "unknown i.MX6"; break; diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h index e8ffa47a7d..1d70d39a3f 100644 --- a/arch/arm/mach-imx/include/mach/imx6.h +++ b/arch/arm/mach-imx/include/mach/imx6.h @@ -14,6 +14,7 @@ void imx6_init_lowlevel(void); #define IMX6_CPUTYPE_IMX6SX 0x462 #define IMX6_CPUTYPE_IMX6D 0x263 #define IMX6_CPUTYPE_IMX6Q 0x463 +#define IMX6_CPUTYPE_IMX6UL 0x164 #define SCU_CONFIG 0x04 @@ -66,5 +67,6 @@ DEFINE_MX6_CPU_TYPE(mx6dl, IMX6_CPUTYPE_IMX6DL); DEFINE_MX6_CPU_TYPE(mx6q, IMX6_CPUTYPE_IMX6Q); DEFINE_MX6_CPU_TYPE(mx6d, IMX6_CPUTYPE_IMX6D); DEFINE_MX6_CPU_TYPE(mx6sx, IMX6_CPUTYPE_IMX6SX); +DEFINE_MX6_CPU_TYPE(mx6ul, IMX6_CPUTYPE_IMX6UL); #endif /* __MACH_IMX6_H */ |