From 54020151feba813f913dc7465606a5dded580fd7 Mon Sep 17 00:00:00 2001 From: Rabeeh Khoury Date: Wed, 25 Sep 2013 21:59:47 +0200 Subject: [PATCH 1/2] SolidRun i.MX6 based carrier one base The patches adds a new machine with id 4773 to the kernel tree. Sets up the Kconfig and Makefile accordingly Signed-off-by: Rabeeh Khoury --- arch/arm/mach-mx6/Kconfig | 33 +++++++++++++++++++++++++++++++++ arch/arm/mach-mx6/Makefile | 1 + arch/arm/tools/mach-types | 1 + 3 files changed, 35 insertions(+) diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig index 64ce4d4..144bb24 100644 --- a/arch/arm/mach-mx6/Kconfig +++ b/arch/arm/mach-mx6/Kconfig @@ -282,6 +282,39 @@ config MACH_MX6Q_HDMIDONGLE Include support for i.MX 6Quad HDMI Dongle platform. This includes specific configurations for the board and its peripherals. +config MACH_C1 + bool "Support SolidRun i.MX6 Carrier One platform" + select ARCH_MX6Q + select SOC_IMX6Q + select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_DMA + select IMX_HAVE_PLATFORM_FEC + select IMX_HAVE_PLATFORM_GPMI_NFC + select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX + select IMX_HAVE_PLATFORM_SPI_IMX + select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_VIV_GPU + select IMX_HAVE_PLATFORM_IMX_VPU + select IMX_HAVE_PLATFORM_IMX_SSI + select IMX_HAVE_PLATFORM_IMX_ANATOP_THERMAL + select IMX_HAVE_PLATFORM_FSL_USB2_UDC + select IMX_HAVE_PLATFORM_MXC_EHCI + select IMX_HAVE_PLATFORM_FSL_OTG + select IMX_HAVE_PLATFORM_FSL_USB_WAKEUP + select IMX_HAVE_PLATFORM_AHCI + select IMX_HAVE_PLATFORM_IMX_OCOTP + select IMX_HAVE_PLATFORM_IMX_VIIM + select IMX_HAVE_PLATFORM_IMX2_WDT + select IMX_HAVE_PLATFORM_IMX_PM + select IMX_HAVE_PLATFORM_MXC_HDMI + select IMX_HAVE_PLATFORM_IMX_ASRC + select IMX_HAVE_PLATFORM_FLEXCAN + select IMX_HAVE_PLATFORM_IMX_PCIE + select IMX_HAVE_PLATFORM_IMX_CAAM + help + Include support for SolidRun i.MX6 based Carrier One board + + comment "MX6 Options:" config IMX_PCIE diff --git a/arch/arm/mach-mx6/Makefile b/arch/arm/mach-mx6/Makefile index 8c1d754..793668e 100644 --- a/arch/arm/mach-mx6/Makefile +++ b/arch/arm/mach-mx6/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_MACH_MX6SL_ARM2) += board-mx6sl_arm2.o mx6sl_arm2_pmic_pfuze100.o obj-$(CONFIG_MACH_MX6SL_EVK) += board-mx6sl_evk.o mx6sl_evk_pmic_pfuze100.o obj-$(CONFIG_MACH_MX6Q_SABRELITE) += board-mx6q_sabrelite.o obj-$(CONFIG_MACH_MX6Q_SABRESD) += board-mx6q_sabresd.o mx6q_sabresd_pmic_pfuze100.o +obj-$(CONFIG_MACH_C1) += board-mx6q_c1.o obj-$(CONFIG_MACH_MX6Q_SABREAUTO) += board-mx6q_sabreauto.o mx6q_sabreauto_pmic_pfuze100.o obj-$(CONFIG_MACH_MX6Q_HDMIDONGLE) += board-mx6q_hdmidongle.o obj-$(CONFIG_SMP) += plat_hotplug.o platsmp.o headsmp.o diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index f6b5c0e..45eac57 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -1120,4 +1120,5 @@ mx6q_arm2 MACH_MX6Q_ARM2 MX6Q_ARM2 3837 mx6sl_arm2 MACH_MX6SL_ARM2 MX6SL_ARM2 4091 mx6q_hdmidongle MACH_MX6Q_HDMIDONGLE MX6Q_HDMIDONGLE 4284 mx6sl_evk MACH_MX6SL_EVK MX6SL_EVK 4307 +c1 MACH_C1 C1 4773 -- 1.7.9.5