From ae36a7c870d0c798a60bc89457ef821e0fbedf63 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Thu, 12 Oct 2017 22:19:05 +0000 Subject: linux: ti-uio: remove KERNEL_DEVICETREE appends * KERNEL_DEVICETREE is now specified in the machine configuration and these appends have already been added there. - This removes the duplcitaion of these device trees in this list and thus resolves the "duplicate node name" failure during the fitImage creation. * Extend am57xx-evm dts injection to dra7xx family - Now that KERNEL_DEVICETREE is specified in the machine configuration, am57xx-hs-evm inherits this list from am57xx-evm. - Extending these injectionsto the entire family allows these device trees to be availble for am57xx-hs-evm as well. - For dra7xx-evm and dra7xx-hs-evm, these device trees will not be built as they are not included in their KERNEL_DEVICETREE list. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/ti-uio.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/recipes-kernel/linux/ti-uio.inc b/recipes-kernel/linux/ti-uio.inc index 13cf53e2..3104f4e9 100644 --- a/recipes-kernel/linux/ti-uio.inc +++ b/recipes-kernel/linux/ti-uio.inc @@ -3,8 +3,8 @@ SRC_URI_append_k2hk = " file://k2hk-uio.dtsi" SRC_URI_append_k2l-evm = " file://k2l-uio.dtsi" SRC_URI_append_k2e = " file://k2e-uio.dtsi" SRC_URI_append_k2g = " file://keystone-k2g-pru-uio.dtsi" -SRC_URI_append_am57xx-evm = " file://am572x-pru-uio.dtsi \ - file://am571x-pru-uio.dtsi \ +SRC_URI_append_dra7xx = " file://am572x-pru-uio.dtsi \ + file://am571x-pru-uio.dtsi \ " SRC_URI_append_ti33x = " file://am335x-pru-uio.dtsi" SRC_URI_append_ti43x = " file://am437x-pru-uio.dtsi" @@ -15,11 +15,6 @@ DTSI_LIST_append_k2hk = " k2hk-uio.dtsi" DTSI_LIST_append_k2l-evm = " k2l-uio.dtsi" DTSI_LIST_append_k2e = " k2e-uio.dtsi" -KERNEL_DEVICETREE_append_am57xx-evm = "${@base_conditional("ENABLE_TI_UIO_DEVICES", "1", " am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb", "", d)}" -KERNEL_DEVICETREE_append_ti33x = "${@base_conditional("ENABLE_TI_UIO_DEVICES", "1", " am335x-icev2-pru-excl-uio.dtb", "", d)}" -KERNEL_DEVICETREE_append_ti43x = "${@base_conditional("ENABLE_TI_UIO_DEVICES", "1", " am437x-idk-pru-excl-uio.dtb", "", d)}" -KERNEL_DEVICETREE_append_k2g = "${@base_conditional("ENABLE_TI_UIO_DEVICES", "1", " keystone-k2g-ice-pru-excl-uio.dtb", "", d)}" - do_setup_uio() { if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] then @@ -35,7 +30,7 @@ do_setup_uio() { fi } -do_setup_uio_append_am57xx-evm() { +do_setup_uio_append_dra7xx() { if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] then -- cgit v1.2.3-54-g00ecf