[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1357935162-7672-3-git-send-email-linux@prisktech.co.nz>
Date: Sat, 12 Jan 2013 09:12:40 +1300
From: Tony Prisk <linux@...sktech.co.nz>
To: olof@...om.net
Cc: linux-arm-kernel@...ts.infradead.org, arm@...nel.org,
linux-kernel@...r.kernel.org,
vt8500-wm8505-linux-kernel@...glegroups.com,
Tony Prisk <linux@...sktech.co.nz>
Subject: [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options
This patch completes the move of arch-vt8500 to multiplatform only.
The remaining single-image Kconfig options are removed from
arch/arm/Kconfig and the options in arch/arm/mach-vt8500/Kconfig
are updated.
Signed-off-by: Tony Prisk <linux@...sktech.co.nz>
---
arch/arm/Kconfig | 21 ---------------------
arch/arm/mach-vt8500/Kconfig | 13 +++----------
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fbb9492..76efd43 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -950,27 +950,6 @@ config ARCH_OMAP
help
Support for TI's OMAP platform (OMAP1/2/3/4).
-config ARCH_VT8500_SINGLE
- bool "VIA/WonderMedia 85xx"
- select ARCH_VT8500
- select COMMON_CLK
- select CPU_ARM926T
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
-
-config ARCH_WM8750_SINGLE
- bool "WonderMedia WM8750/WM8850"
- select ARCH_VT8500
- select COMMON_CLK
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
- select USE_OF
- help
- Support for WonderMedia WM8750/WM8850 System-on-Chip.
-
endchoice
menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index d67c7fa..f466b58 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -8,9 +8,8 @@ config ARCH_VT8500
select HAVE_CLK
config ARCH_WM8505
- bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE
+ bool "VIA/WonderMedia 85xx"
depends on ARCH_MULTI_V5
- default ARCH_VT8500_SINGLE
select ARCH_VT8500
select CPU_ARM926T
help
@@ -18,7 +17,7 @@ config ARCH_WM8505
config ARCH_WM8750
bool "WonderMedia WM8750"
- depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V6
select ARCH_VT8500
select CPU_V6
help
@@ -26,14 +25,8 @@ config ARCH_WM8750
config ARCH_WM8850
bool "WonderMedia WM8850"
- depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE
+ depends on ARCH_MULTI_V7
select ARCH_VT8500
select CPU_V7
help
Support for WonderMedia WM8850 System-on-Chip.
-
-# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off
-config ARCH_WM8850_AUTO
- def_bool y
- depends on ARCH_WM8750_SINGLE && !ARCH_WM8750
- select ARCH_WM8850
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists