aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-08 05:45:19 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-07-15 05:23:59 -0400
commit7aff0f29cdb484a5d9692a4d6c9e4b908a848688 (patch)
treea733c8d6970133947f2fef174acbee1875dc82f5
parent94197ad713a6f7f164837ac674726d3af70a7c53 (diff)
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>
-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 fbd7de633788..e900dad597c6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -7,9 +7,10 @@ dtb-$(CONFIG_MACH_ARTPEC6) += \
7dtb-$(CONFIG_MACH_ASM9260) += \ 7dtb-$(CONFIG_MACH_ASM9260) += \
8 alphascale-asm9260-devkit.dtb 8 alphascale-asm9260-devkit.dtb
9# Keep at91 dtb files sorted alphabetically for each SoC 9# Keep at91 dtb files sorted alphabetically for each SoC
10dtb-$(CONFIG_SOC_SAM_V4_V5) += \ 10dtb-$(CONFIG_SOC_AT91RM9200) += \
11 at91rm9200ek.dtb \ 11 at91rm9200ek.dtb \
12 mpa1600.dtb \ 12 mpa1600.dtb
13dtb-$(CONFIG_SOC_AT91SAM9) += \
13 animeo_ip.dtb \ 14 animeo_ip.dtb \
14 at91-qil_a9260.dtb \ 15 at91-qil_a9260.dtb \
15 aks-cdu.dtb \ 16 aks-cdu.dtb \