diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-09-27 10:10:12 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 22:27:07 +0200 |
| commit | 46f2007c1efadfa4071c17e75f140c47f09293de (patch) | |
| tree | e38579fafadcc3b8ae70575339647cd444e34f7c | |
| parent | 30411c2cad86bac4736589b116c7234c33ceec8f (diff) | |
| download | talos-op-linux-46f2007c1efadfa4071c17e75f140c47f09293de.tar.gz talos-op-linux-46f2007c1efadfa4071c17e75f140c47f09293de.zip | |
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: 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>
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/plat-orion/Makefile | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 26a817d81a70..416d46ef7ebd 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -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 diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index cbe566443063..57f996b6aa0e 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -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 diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile index 1251e5bd41c5..a82cecb84948 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/plat-orion/Makefile @@ -1,6 +1,7 @@ # # Makefile for the linux kernel. # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include obj-y += addr-map.o |
