Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f2007c authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

ARM: mvebu: fix build breaks from multi-platform conversion 



Moving ARCH_MVEBU for multi-platform support caused several breakages in
recently added addr-map and pinctrl support for mvebu. This adds the
necessary selects and include paths to fix the build.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 30411c2c

arch/arm/mach-mvebu/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ config ARCH_MVEBU 
	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select PLAT_ORION

	select SPARSE_IRQ



if ARCH_MVEBU

arch/arm/mach-mvebu/Makefile

+2 −1
Original line number Diff line number Diff line 
ccflags-$(ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-orion/include



obj-y += system-controller.o

obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o

arch/arm/plat-orion/Makefile

+1 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



obj-y                             += addr-map.o