summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-08 11:45:19 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-07-15 11:23:59 +0200
commit7aff0f29cdb484a5d9692a4d6c9e4b908a848688 (patch)
treea733c8d6970133947f2fef174acbee1875dc82f5 /arch/arm/boot
parent94197ad713a6f7f164837ac674726d3af70a7c53 (diff)
downloadop-kernel-dev-7aff0f29cdb484a5d9692a4d6c9e4b908a848688.zip
op-kernel-dev-7aff0f29cdb484a5d9692a4d6c9e4b908a848688.tar.gz
ARM: dts: at91: Don't build unnecessary dtbs
Building both ARMv4 and ARMv5 dtbs when SOC_SAM_V4_V5 is an issue for kernelci because it will then attempt to boot ARMv4 kernels on at91sam9 which doesn't work. Use CONFIG_SOC_AT91RM9200 and CONFIG_SOC_AT91SAM9 instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index fbd7de6..e900dad 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -7,9 +7,10 @@ dtb-$(CONFIG_MACH_ARTPEC6) += \
dtb-$(CONFIG_MACH_ASM9260) += \
alphascale-asm9260-devkit.dtb
# Keep at91 dtb files sorted alphabetically for each SoC
-dtb-$(CONFIG_SOC_SAM_V4_V5) += \
+dtb-$(CONFIG_SOC_AT91RM9200) += \
at91rm9200ek.dtb \
- mpa1600.dtb \
+ mpa1600.dtb
+dtb-$(CONFIG_SOC_AT91SAM9) += \
animeo_ip.dtb \
at91-qil_a9260.dtb \
aks-cdu.dtb \
OpenPOWER on IntegriCloud