From f6726f6ffa1cda6e1a7807cdda2946677d0208d4 Mon Sep 17 00:00:00 2001 From: Hongmei Gou Date: Wed, 6 Sep 2017 04:47:40 +0000 Subject: [PATCH] conf/machine: add pru-uio dtbs in KERNEL_DEVICETREE for am3/am4/am5/k2g Signed-off-by: Hongmei Gou Signed-off-by: Denys Dmytriyenko --- conf/machine/am57xx-evm.conf | 3 ++- conf/machine/include/ti33x.inc | 2 +- conf/machine/include/ti43x.inc | 2 +- conf/machine/k2g-evm.conf | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index 3bc2d132..78f56e60 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf @@ -14,7 +14,8 @@ KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \ am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \ am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ - am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" + am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \ + ${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" UBOOT_MACHINE = "am57xx_evm_config" diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index cadc7df6..4014f79f 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -26,7 +26,7 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb am335x-icev2.dtb" +KERNEL_DEVICETREE = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb am335x-icev2.dtb ${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" UBOOT_ARCH = "arm" UBOOT_MACHINE = "am335x_evm_config" diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index 2d563ee7..243bc5a6 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc @@ -26,7 +26,7 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb" +KERNEL_DEVICETREE = "am43x-epos-evm.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb am437x-idk-evm.dtb ${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" UBOOT_ARCH = "arm" UBOOT_MACHINE = "am43xx_evm_config" diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf index 32228682..da0234b5 100644 --- a/conf/machine/k2g-evm.conf +++ b/conf/machine/k2g-evm.conf @@ -6,7 +6,8 @@ require conf/machine/include/k2g.inc MACHINE_FEATURES += "alsa" -KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb" +KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb \ + ${@base_conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}" UBOOT_MACHINE = "k2g_evm_config"