Move all of the at91 rules over to use SoC-specific Kconfig options.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/dts/Makefile | 92 ++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 59 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d8af3c26b27..e3e030a9fb6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,10 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+
-dtb-$(CONFIG_TARGET_SMARTWEB) += at91sam9260-smartweb.dtb -dtb-$(CONFIG_TARGET_TAURUS) += at91sam9g20-taurus.dtb -dtb-$(CONFIG_TARGET_CORVUS) += at91sam9g45-corvus.dtb -dtb-$(CONFIG_TARGET_GURNARD) += at91sam9g45-gurnard.dtb - dtb-$(CONFIG_TARGET_SMDKC100) += s5pc1xx-smdkc100.dtb dtb-$(CONFIG_TARGET_S5P_GONI) += s5pc1xx-goni.dtb dtb-$(CONFIG_ARCH_EXYNOS4) += exynos4210-origen.dtb \ @@ -1184,48 +1179,45 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \ keystone-k2g-generic.dtb \ keystone-k2g-ice.dtb
-dtb-$(CONFIG_TARGET_AT91SAM9261EK) += at91sam9261ek.dtb - -dtb-$(CONFIG_TARGET_PM9261) += at91sam9261ek.dtb - -dtb-$(CONFIG_TARGET_PM9263) += at91sam9263ek.dtb - -dtb-$(CONFIG_TARGET_MEESC) += at91sam9263ek.dtb - -dtb-$(CONFIG_TARGET_AT91SAM9263EK) += at91sam9263ek.dtb - -dtb-$(CONFIG_TARGET_AT91SAM9RLEK) += at91sam9rlek.dtb +dtb-$(CONFIG_AT91SAM9RL) += at91sam9rlek.dtb
dtb-$(CONFIG_AT91SAM9260) += \ + at91sam9260ek.dtb \ + at91sam9260-smartweb.dtb \ at91sam9260ek.dtb
+dtb-$(CONFIG_AT91SAM9261) += at91sam9261ek.dtb + +dtb-$(CONFIG_AT91SAM9263) += at91sam9263ek.dtb + dtb-$(CONFIG_AT91SAM9G20) += \ + at91sam9g20-taurus.dtb \ at91sam9g20ek.dtb \ at91sam9g20ek_2mmc.dtb
dtb-$(CONFIG_AT91SAM9M10G45) += at91sam9m10g45ek.dtb
-dtb-$(CONFIG_TARGET_PM9G45) += at91sam9m10g45ek.dtb +dtb-$(CONFIG_AT91SAM9G45) += \ + at91sam9g45-corvus.dtb \ + at91sam9g45-gurnard.dtb \
-dtb-$(CONFIG_TARGET_AT91SAM9X5EK) += \ +dtb-$(CONFIG_AT91SAM9X5) += \ + at91sam9g25-gardena-smart-gateway.dtb \ at91sam9g15ek.dtb \ at91sam9g25ek.dtb \ at91sam9g35ek.dtb \ at91sam9x25ek.dtb \ at91sam9x35ek.dtb
-dtb-$(CONFIG_TARGET_SAM9X60EK) += sam9x60ek.dtb - -dtb-$(CONFIG_TARGET_SAM9X60_CURIOSITY) += at91-sam9x60_curiosity.dtb - -dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += at91sam9n12ek.dtb +dtb-$(CONFIG_SAM9X60) += \ + at91-sam9x60_curiosity.dtb \ + sam9x60ek.dtb
-dtb-$(CONFIG_TARGET_GARDENA_SMART_GATEWAY_AT91SAM) += \ - at91sam9g25-gardena-smart-gateway.dtb +dtb-$(CONFIG_AT91SAM9N12) += at91sam9n12ek.dtb
-dtb-$(CONFIG_TARGET_ETHERNUT5) += ethernut5.dtb - -dtb-$(CONFIG_TARGET_USB_A9263) += usb_a9263.dtb +dtb-$(CONFIG_AT91SAM9XE) += \ + ethernut5.dtb \ + usb_a9263.dtb
dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \ logicpd-som-lv-35xx-devkit.dtb \ @@ -1255,32 +1247,21 @@ dtb-$(CONFIG_TARGET_OMAP4_SDP4430) += \ omap4-sdp.dtb \ omap4-sdp-es23plus.dtb
-dtb-$(CONFIG_TARGET_SAMA7G5EK) += \ +dtb-$(CONFIG_SAMA7G5) += \ at91-sama7g5ek.dtb
-dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \ - at91-sama5d2_ptc_ek.dtb - -dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \ - at91-sama5d2_xplained.dtb - -dtb-$(CONFIG_TARGET_SAMA5D27_SOM1_EK) += \ +dtb-$(CONFIG_SAMA5D2) += \ + at91-kstr-sama5d27.dtb \ + at91-sama5d2_ptc_ek.dtb \ + at91-sama5d2_xplained.dtb \ + at91-sama5d27_giantboard.dtb \ at91-sama5d27_som1_ek.dtb \ - at91-sama5d27_giantboard.dtb - -dtb-$(CONFIG_TARGET_SAMA5D27_WLSOM1_EK) += \ - at91-sama5d27_wlsom1_ek.dtb - -dtb-$(CONFIG_TARGET_KSTR_SAMA5D27) += \ - at91-kstr-sama5d27.dtb - -dtb-$(CONFIG_TARGET_SAMA5D2_ICP) += \ + at91-sama5d27_wlsom1_ek.dtb \ + at91-sama5d29_curiosity.dtb \ at91-sama5d2_icp.dtb
-dtb-$(CONFIG_TARGET_SAMA5D29_CURIOSITY) += \ - at91-sama5d29_curiosity.dtb - -dtb-$(CONFIG_TARGET_SAMA5D3XEK) += \ +dtb-$(CONFIG_SAMA5D3) += \ + at91-sama5d3_xplained.dtb \ sama5d31ek.dtb \ sama5d33ek.dtb \ sama5d34ek.dtb \ @@ -1288,16 +1269,9 @@ dtb-$(CONFIG_TARGET_SAMA5D3XEK) += \ sama5d36ek.dtb \ sama5d36ek_cmp.dtb
-dtb-$(CONFIG_TARGET_SAMA5D3_XPLAINED) += \ - at91-sama5d3_xplained.dtb - -dtb-$(CONFIG_TARGET_SAMA5D4EK) += \ - at91-sama5d4ek.dtb - -dtb-$(CONFIG_TARGET_SAMA5D4_XPLAINED) += \ - at91-sama5d4_xplained.dtb - -dtb-$(CONFIG_TARGET_VINCO) += \ +dtb-$(CONFIG_SAMA5D4) += \ + at91-sama5d4ek.dtb \ + at91-sama5d4_xplained.dtb \ at91-vinco.dtb
dtb-$(CONFIG_ARCH_BCM283X) += \