aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-20 02:30:53 -0500
committerArnd Bergmann <arnd@arndb.de>2014-11-20 02:30:53 -0500
commit86dd04a22a9880a9f790473d535f77edee5f621f (patch)
treee105aab1465bddf69a72103b3904ee45507eac2e /arch/arm/mach-shmobile/Kconfig
parent21220a7a32c907d620ab60098c7da5bfdba24c13 (diff)
parent79e69d179cb3391040a3693fca8bc12ec03c05fc (diff)
Merge tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Pull "Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19" from Simon Horman: * Remove lecacy C koelsh board support * tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: koelsch dts: Drop console= bootargs parameter ARM: dts: koelsch: Stop building r8a7791-koelsch.dtb in legacy builds MAINTAINERS: Remove reference to shmobile / koelsch_defconfig ARM: shmobile: koelsch: Remove reference board code ARM: shmobile: r8a7791: Remove legacy code ARM: shmobile: koelsch: Remove legacy C board code ARM: shmobile: Remove shmobile_clk_workaround() implementation Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
-rw-r--r--arch/arm/mach-shmobile/Kconfig19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f59019dd986e..0f2539550f1b 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -72,11 +72,6 @@ config ARCH_R8A7794
72 72
73comment "Renesas ARM SoCs Board Type" 73comment "Renesas ARM SoCs Board Type"
74 74
75config MACH_KOELSCH
76 bool "Koelsch board"
77 depends on ARCH_R8A7791
78 select MICREL_PHY if SH_ETH
79
80config MACH_LAGER 75config MACH_LAGER
81 bool "Lager board" 76 bool "Lager board"
82 depends on ARCH_R8A7790 77 depends on ARCH_R8A7790
@@ -144,14 +139,6 @@ config ARCH_R8A7790
144 select MIGHT_HAVE_PCI 139 select MIGHT_HAVE_PCI
145 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 140 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
146 141
147config ARCH_R8A7791
148 bool "R-Car M2-W (R8A77910)"
149 select ARCH_RCAR_GEN2
150 select ARCH_WANT_OPTIONAL_GPIOLIB
151 select ARM_GIC
152 select MIGHT_HAVE_PCI
153 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
154
155comment "Renesas ARM SoCs Board Type" 142comment "Renesas ARM SoCs Board Type"
156 143
157config MACH_APE6EVM 144config MACH_APE6EVM
@@ -226,12 +213,6 @@ config MACH_LAGER
226 select MICREL_PHY if SH_ETH 213 select MICREL_PHY if SH_ETH
227 select SND_SOC_AK4642 if SND_SIMPLE_CARD 214 select SND_SOC_AK4642 if SND_SIMPLE_CARD
228 215
229config MACH_KOELSCH
230 bool "Koelsch board"
231 depends on ARCH_R8A7791
232 select USE_OF
233 select MICREL_PHY if SH_ETH
234
235config MACH_KZM9G 216config MACH_KZM9G
236 bool "KZM-A9-GT board" 217 bool "KZM-A9-GT board"
237 depends on ARCH_SH73A0 218 depends on ARCH_SH73A0