summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:27 +0200
commit4a1d867da4bba530f7e236f4ff244dc7f6099257 (patch)
treed563efadb965ddcc8fff8128c68d9363b84af071 /arch/arm/mach-imx/Kconfig
parent37294dfd1c6cd7642e91bee8b009907b8f91af2e (diff)
parentf91b28d3113bc21048b74d4517c77072ed9c6cdf (diff)
downloadbarebox-4a1d867da4bba530f7e236f4ff244dc7f6099257.tar.gz
barebox-4a1d867da4bba530f7e236f4ff244dc7f6099257.tar.xz
Merge branch 'for-next/imx' into master
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r--arch/arm/mach-imx/Kconfig11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 720fe874d7..dd49537fd5 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -146,7 +146,7 @@ config ARCH_IMX6
select ARCH_HAS_IMX_GPT
select CPU_V7
select PINCTRL_IMX_IOMUX_V3
- select OFTREE
+ select OFDEVICE
select COMMON_CLK_OF_PROVIDER
select HW_HAS_PCI
@@ -157,8 +157,6 @@ config ARCH_IMX6SL
config ARCH_IMX6SX
bool
select ARCH_IMX6
- select OFTREE
- select COMMON_CLK_OF_PROVIDER
config ARCH_IMX6UL
bool
@@ -340,6 +338,8 @@ config MACH_PHYTEC_SOM_IMX6
bool "Phytec phyCARD-i.MX6 and phyFLEX-i.MX6"
select ARCH_IMX6
select ARCH_IMX6UL
+ select I2C
+ select I2C_IMX
config MACH_PROTONIC_IMX6
bool "Protonic-Holland i.MX6 based boards"
@@ -578,6 +578,11 @@ config MACH_DIGI_CCIMX6ULSBCPRO
select ARCH_IMX6UL
select ARM_USE_COMPRESSED_DTB
+config MACH_WEBASTO_CCBV2
+ bool "Webasto Common Communication Board V2"
+ select ARCH_IMX6UL
+ select ARM_USE_COMPRESSED_DTB
+
endif
# ----------------------------------------------------------