kirkwood: combine support for openrd base/client support
Subsystems (2)
PATCH v2 1/1 kirkwood: combine support for openrd base/client support
Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together.
The only difference between v1 and v2 is that the un-necessary ifdef's have been remove as recommended by Nico.
Signed-off-by Alexander Clouter <[email protected]>
--- arch/arm/mach-kirkwood/Kconfig | 11 +++ arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 115 ++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/openrd_base-setup.c | 96 ----------------------- 4 files changed, 127 insertions(+), 97 deletions(-) create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c
arch/arm/mach-kirkwood/Kconfig +11 -0
@@ -38,12 +38,23 @@ config MACH_TS219 Say 'Y' here if you want your kernel to support the QNAP TS-119 and TS-219 Turbo NAS devices. +config MACH_OPENRD + bool + config MACH_OPENRD_BASE bool "Marvell OpenRD Base Board" + select MACH_OPENRD help Say 'Y' here if you want your kernel to support the Marvell OpenRD Base Board. +config MACH_OPENRD_CLIENT + bool "Marvell OpenRD Client Board" + select MACH_OPENRD + help + Say 'Y' here if you want your kernel to support the + Marvell OpenRD Client Board. + endmenu endif
arch/arm/mach-kirkwood/Makefile +1 -1
@@ -6,6 +6,6 @@ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o -obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o +obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o
arch/arm/mach-kirkwood/openrd-setup.c new file +115 -0
115 lines not on this page · raw message
arch/arm/mach-kirkwood/openrd_base-setup.c deleted +0 -96
96 lines not on this page · raw message
Signature · 1 line
1.6.4.3