From: andrew@lunn.ch (Andrew Lunn) Date: Tue, 21 Jan 2014 10:45:01 +0100 Subject: [PATCH v2 14/15] watchdog: orion: Allow to build on any Orion platform In-Reply-To: <52DE40BD.10700@gmail.com> References: <1390295561-3466-1-git-send-email-ezequiel.garcia@free-electrons.com> <1390295561-3466-15-git-send-email-ezequiel.garcia@free-electrons.com> <52DE40BD.10700@gmail.com> Message-ID: <20140121094501.GA13396@lunn.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jan 21, 2014 at 10:41:17AM +0100, Sebastian Hesselbarth wrote: > On 01/21/14 10:12, Ezequiel Garcia wrote: > >After getting rid of all the mach-specific code, it's now possible > >to allow builds in any Orion platform. > > > >Signed-off-by: Ezequiel Garcia > >--- > > drivers/watchdog/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > >index 5be6e91..1689f72 100644 > >--- a/drivers/watchdog/Kconfig > >+++ b/drivers/watchdog/Kconfig > >@@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG > > > > config ORION_WATCHDOG > > tristate "Orion watchdog" > >- depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE > >+ depends on PLAT_ORION > > Ezequiel, > > while above is true now, I tend to rather have ARCH_MVEBU added here. > We really want to get rid of both !ARCH_MVEBU and PLAT_ORION and this > unnecessarily will make it more complicated. > > I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, > but IIRC it was just because of a missing mbus driver? If it is just > this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean > cut between new common arch and existing sub-archs. I took a look at this when moving DT kirkwood into mach-mvebu. There is nothing in plat-orion which ARCH_MVEBU needs. So i agree with Sebastian, it should be PLAT_ORION || ARCH_MVEBU. Andrew