Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Only build OMAP dtb if associated SoC is built

With ARCH_OMAP2PLUS being separated out into OMAP2/3/4/5 etc all the TI device
tree blobs are built no matter the combination of SoCs that are enabled. This
often causes a bunch of irrelevant .dts to be built on a multi platform kernel,
this enables the building of just the ones relevant to the SoCs that are
actually enabled. It also orders the dts file alphabetically.

This also helps to avoid trivial merge conflicts when adding support
for new boards.

[tony@atomide.com: updated the order for am335x and am43x, moved am3517 to omap3]
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Peter Robinson and committed by
Tony Lindgren
ae774090 89ca3b88

+34 -34
+34 -34
arch/arm/boot/dts/Makefile
··· 230 230 dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ 231 231 nspire-tp.dtb \ 232 232 nspire-clp.dtb 233 - dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 234 - omap2430-sdp.dtb \ 233 + dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \ 235 234 omap2420-n800.dtb \ 236 235 omap2420-n810.dtb \ 237 236 omap2420-n810-wimax.dtb \ 237 + omap2430-sdp.dtb 238 + dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \ 239 + am3517-evm.dtb \ 240 + am3517_mt_ventoux.dtb \ 238 241 omap3430-sdp.dtb \ 239 242 omap3-beagle.dtb \ 240 - omap3-cm-t3517.dtb \ 241 - omap3-sbc-t3517.dtb \ 242 - omap3-cm-t3530.dtb \ 243 - omap3-sbc-t3530.dtb \ 244 - omap3-cm-t3730.dtb \ 245 - omap3-sbc-t3730.dtb \ 246 - omap3-devkit8000.dtb \ 247 243 omap3-beagle-xm.dtb \ 248 244 omap3-beagle-xm-ab.dtb \ 245 + omap3-cm-t3517.dtb \ 246 + omap3-cm-t3530.dtb \ 247 + omap3-cm-t3730.dtb \ 248 + omap3-devkit8000.dtb \ 249 249 omap3-evm.dtb \ 250 250 omap3-evm-37xx.dtb \ 251 + omap3-gta04.dtb \ 252 + omap3-igep0020.dtb \ 253 + omap3-igep0030.dtb \ 251 254 omap3-ldp.dtb \ 255 + omap3-lilly-dbb056.dtb \ 252 256 omap3-n900.dtb \ 253 257 omap3-n9.dtb \ 254 258 omap3-n950.dtb \ 255 259 omap3-overo-alto35.dtb \ 256 - omap3-overo-storm-alto35.dtb \ 257 260 omap3-overo-chestnut43.dtb \ 258 - omap3-overo-storm-chestnut43.dtb \ 259 261 omap3-overo-gallop43.dtb \ 260 - omap3-overo-storm-gallop43.dtb \ 261 262 omap3-overo-palo43.dtb \ 263 + omap3-overo-storm-alto35.dtb \ 264 + omap3-overo-storm-chestnut43.dtb \ 265 + omap3-overo-storm-gallop43.dtb \ 262 266 omap3-overo-storm-palo43.dtb \ 263 - omap3-overo-summit.dtb \ 264 267 omap3-overo-storm-summit.dtb \ 265 - omap3-overo-tobi.dtb \ 266 268 omap3-overo-storm-tobi.dtb \ 267 - omap3-gta04.dtb \ 268 - omap3-igep0020.dtb \ 269 - omap3-igep0030.dtb \ 270 - omap3-lilly-dbb056.dtb \ 271 - omap3-zoom3.dtb \ 272 - omap4-duovero-parlor.dtb \ 269 + omap3-overo-summit.dtb \ 270 + omap3-overo-tobi.dtb \ 271 + omap3-sbc-t3517.dtb \ 272 + omap3-sbc-t3530.dtb \ 273 + omap3-sbc-t3730.dtb \ 274 + omap3-zoom3.dtb 275 + dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \ 276 + am335x-bone.dtb \ 277 + am335x-boneblack.dtb \ 278 + am335x-evm.dtb \ 279 + am335x-evmsk.dtb \ 280 + am335x-nano.dtb 281 + dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \ 273 282 omap4-panda.dtb \ 274 283 omap4-panda-a4.dtb \ 275 284 omap4-panda-es.dtb \ 276 - omap4-var-som.dtb \ 277 285 omap4-sdp.dtb \ 278 286 omap4-sdp-es23plus.dtb \ 279 - omap5-uevm.dtb \ 280 - am335x-evm.dtb \ 281 - am335x-evmsk.dtb \ 282 - am335x-bone.dtb \ 283 - am335x-boneblack.dtb \ 284 - am335x-nano.dtb \ 285 - am335x-base0033.dtb \ 286 - am3517-craneboard.dtb \ 287 - am3517-evm.dtb \ 288 - am3517_mt_ventoux.dtb \ 289 - am43x-epos-evm.dtb \ 290 - am437x-gp-evm.dtb \ 291 - dra7-evm.dtb 287 + omap4-var-som.dtb 288 + dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \ 289 + am437x-gp-evm.dtb 290 + dtb-$(CONFIG_SOC_OMAP5) += omap5-uevm.dtb 291 + dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb 292 292 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb 293 293 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 294 294 dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \