Skip to content

Commit

Permalink
ARM: mvebu: fix build breaks from multi-platform conversion
Browse files Browse the repository at this point in the history
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: Rob 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: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Rob Herring authored and Arnd Bergmann committed Sep 28, 2012
1 parent 30411c2 commit 46f2007
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/arm/mach-mvebu/Kconfig
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion arch/arm/mach-mvebu/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
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
1 change: 1 addition & 0 deletions arch/arm/plat-orion/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# Makefile for the linux kernel.
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include

obj-y += addr-map.o

0 comments on commit 46f2007

Please sign in to comment.