2015-04-02 14:20:39

by Arnd Bergmann

Subject: Re: [GIT PULL] at91: multiplatform for 4.1 #1

On Thursday 19 March 2015 18:14:29 Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
>
> This is the real switch to multi-platform for AT91: after all the preparation
> work that has been done, here we are! And there's also an additional cleanup on
> top of that...
> I stacked this material on top of my previous "at91-cleanup3" tag that I had sent
> you earlier this week. As all my cleanup material is also on top of the fixes
> tags (that you already have), these patches are also adapted to match this
> state and avoid conflicts.
> So, you can have this tag in your "multiplatform" branch separated, like I did,
> or simply stacked on top or the AT91 cleanup material.

I got a build error with legacy (non-multi) platforms when ARCH_AT91 is enabled
and needed this change on top:

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e2cd30f6c23d..fd95f34945f4 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,6 @@
menuconfig ARCH_AT91
bool "Atmel SoCs"
+ depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select COMMON_CLK_AT91
select PINCTRL

Can you check if that is the right approach and submit it as a proper
patch?

Arnd

2015-04-02 15:07:50

by Nicolas Ferre

Subject: [PATCH] ARM: at91: add a Kconfig dependency on multi-platform

When building a legacy (non-multi) platforms and if the ARCH_AT91 config option
is enabled there is a build error. We need AT91 to depend on multi-platform
core type options.

Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
arch/arm/mach-at91/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e2cd30f6c23d..fd95f34945f4 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,6 @@
menuconfig ARCH_AT91
bool "Atmel SoCs"
+ depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select COMMON_CLK_AT91
select PINCTRL
--
2.1.3

2015-04-03 17:48:03

by Olof Johansson

Subject: Re: [PATCH] ARM: at91: add a Kconfig dependency on multi-platform

On Thu, Apr 02, 2015 at 05:07:57PM +0200, Nicolas Ferre wrote:
> When building a legacy (non-multi) platforms and if the ARCH_AT91 config option
> is enabled there is a build error. We need AT91 to depend on multi-platform
> core type options.
>
> Reported-by: Arnd Bergmann <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>

Applied, thanks.


-Olof