From: holler@ahsoftware.de (Alexander Holler)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: Remove machine type dockstar (use sheevaplug instead)
Date: Wed, 6 Apr 2011 22:35:21 +0200 [thread overview]
Message-ID: <1302122121-3652-3-git-send-email-holler@ahsoftware.de> (raw)
In-Reply-To: <1302122121-3652-1-git-send-email-holler@ahsoftware.de>
There is no need to have a different machine type for Seagate DockStars.
Remove it.
Be aware, this patch requires a change in the bootloader to feed the
same machine type to the kernel as used for Marvell SheevaPlugs.
Signed-off-by: Alexander Holler <holler@ahsoftware.de>
---
arch/arm/mach-kirkwood/Kconfig | 10 ++--------
arch/arm/mach-kirkwood/Makefile | 1 -
arch/arm/mach-kirkwood/sheevaplug-setup.c | 10 ----------
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 7fc603b..9dafb58 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -27,10 +27,10 @@ config MACH_MV88F6281GTW_GE
Marvell 88F6281 GTW GE Board.
config MACH_SHEEVAPLUG
- bool "Marvell SheevaPlug Reference Board"
+ bool "Marvell SheevaPlug Reference Board or Seagate DockStar"
help
Say 'Y' here if you want your kernel to support the
- Marvell SheevaPlug Reference Board.
+ Marvell SheevaPlug Reference Board or the Seagate DockStar.
config MACH_ESATA_SHEEVAPLUG
bool "Marvell eSATA SheevaPlug Reference Board"
@@ -58,12 +58,6 @@ config MACH_TS41X
QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
NAS devices.
-config MACH_DOCKSTAR
- bool "Seagate FreeAgent DockStar"
- help
- Say 'Y' here if you want your kernel to support the
- Seagate FreeAgent DockStar.
-
config MACH_OPENRD
bool
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index f06bc3d..48c3c83 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
-obj-$(CONFIG_MACH_DOCKSTAR) += sheevaplug-setup.o
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index d1593db..f548aa9 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -177,13 +177,3 @@ MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
.timer = &kirkwood_timer,
MACHINE_END
#endif
-
-#ifdef CONFIG_MACH_DOCKSTAR
-MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")
- .boot_params = 0x00000100,
- .init_machine = sheevaplug_init,
- .map_io = kirkwood_map_io,
- .init_irq = kirkwood_init_irq,
- .timer = &kirkwood_timer,
-MACHINE_END
-#endif
--
1.7.2.2
next prev parent reply other threads:[~2011-04-06 20:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-06 20:35 [PATCH 0/2] ARM: Unify setup for Marvell SheevaPlugs and Seagate DockStars Alexander Holler
2011-04-06 20:35 ` [PATCH 1/2] ARM: Differentiate SheevaPlugs and DockStars on the basis of the memory size Alexander Holler
2011-04-06 21:44 ` Nicolas Pitre
2011-04-06 22:45 ` Alexander Holler
2011-04-06 23:01 ` Nicolas Pitre
2011-04-06 23:22 ` Alexander Holler
2011-04-07 2:55 ` Nicolas Pitre
[not found] ` <toa078-0do.ln1@chipmunk.wormnet.eu>
2011-04-07 21:31 ` Alexander Holler
2011-04-07 21:44 ` Alexander Clouter
2011-04-07 21:59 ` Alexander Holler
2011-04-07 22:08 ` Russell King - ARM Linux
2011-04-07 23:04 ` Alexander Holler
2011-04-08 7:24 ` Russell King - ARM Linux
2011-04-08 8:38 ` Alexander Holler
2011-04-09 8:29 ` Bernd Petrovitsch
2011-04-10 18:14 ` Alexander Holler
2011-04-10 19:29 ` Alexander Holler
2011-04-06 23:23 ` Eric Cooper
2011-04-06 20:35 ` Alexander Holler [this message]
2011-04-06 21:02 ` [PATCH 2/2] ARM: Remove machine type dockstar (use sheevaplug instead) Nicolas Pitre
2011-04-06 21:43 ` Alexander Holler
2011-04-06 22:50 ` [PATCH 0/2] ARM: Unify setup for Marvell SheevaPlugs and Seagate DockStars Nico Erfurth
2011-04-07 9:20 ` Alexander Holler
2011-04-07 9:37 ` Nico Erfurth
2011-04-07 9:44 ` Alexander Holler
2011-04-07 17:39 ` Russell King - ARM Linux
2011-04-08 3:38 ` Alexander Holler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302122121-3652-3-git-send-email-holler@ahsoftware.de \
--to=holler@ahsoftware.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).