From f358a91cfbb1f018c1f35403ed7687fc0c52375c Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Wed, 1 Aug 2012 12:49:28 -0500 Subject: [PATCH] --- yaml --- r: 326763 b: refs/heads/master c: f60c99e22cae4d8761c86967a14e4621322c057e h: refs/heads/master i: 326761: 48308882de2a39056f8ddb9ca42e4da935c9ed4b 326759: a0aef7b33be166146aea6d54a7d97db15d494292 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 26 -------------------------- trunk/arch/arm/mach-imx/Makefile | 3 --- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/[refs] b/[refs] index 8957d19534d0..c327efa3a793 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 212d0b8327b21d6dfe0a9e9dc8935a7150e370d0 +refs/heads/master: f60c99e22cae4d8761c86967a14e4621322c057e diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 156c98629624..e4aa08217260 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -736,32 +736,6 @@ config MACH_EUKREA_MBIMXSD51_BASEBOARD endchoice -config MX51_EFIKA_COMMON - bool - select SOC_IMX51 - select IMX_HAVE_PLATFORM_IMX_UART - select IMX_HAVE_PLATFORM_MXC_EHCI - select IMX_HAVE_PLATFORM_PATA_IMX - select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX - select IMX_HAVE_PLATFORM_SPI_IMX - select MXC_ULPI if USB_ULPI - -config MACH_MX51_EFIKAMX - bool "Support MX51 Genesi Efika MX nettop" - select LEDS_GPIO_REGISTER - select MX51_EFIKA_COMMON - help - Include support for Genesi Efika MX nettop. This includes specific - configurations for the board and its peripherals. - -config MACH_MX51_EFIKASB - bool "Support MX51 Genesi Efika Smartbook" - select LEDS_GPIO_REGISTER - select MX51_EFIKA_COMMON - help - Include support for Genesi Efika Smartbook. This includes specific - configurations for the board and its peripherals. - comment "i.MX53 machines:" config MACH_IMX53_DT diff --git a/trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-imx/Makefile index 07f7c226e4cf..88b756c4082b 100644 --- a/trunk/arch/arm/mach-imx/Makefile +++ b/trunk/arch/arm/mach-imx/Makefile @@ -89,9 +89,6 @@ obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o -obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o -obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o -obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o