From dc10c6f2de239bd9134574838bc23af603ae7de3 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Thu, 14 May 2020 18:29:26 +0800 Subject: [PATCH] qoriq: remove usdpaa dtb from KERNEL_DEVICETREE usdpaa is unsupported feature now, and usdpaa dts does not exist in pure mainline kernel. It only exist in kernel from NXP bsp. Remove them to avoid failure when building pure mainline kernel. Signed-off-by: Ting Liu --- conf/machine/ls1043ardb.conf | 2 +- conf/machine/ls1046afrwy.conf | 1 - conf/machine/ls1046ardb.conf | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index ee961cc3..7a7af273 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf @@ -22,7 +22,7 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa" UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin" UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" -KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb freescale/fsl-ls1043a-qds.dtb freescale/fsl-ls1043a-qds-sdk.dtb" +KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-qds.dtb freescale/fsl-ls1043a-qds-sdk.dtb" KERNEL_DEFCONFIG ?= "defconfig" UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd" diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf index e685c141..845b4089 100644 --- a/conf/machine/ls1046afrwy.conf +++ b/conf/machine/ls1046afrwy.conf @@ -23,7 +23,6 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-d KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1046a-frwy-sdk.dtb \ - freescale/fsl-ls1046a-frwy-usdpaa.dtb \ " KERNEL_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 7efb91f1..6357a439 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -23,7 +23,6 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dt KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1046a-rdb-sdk.dtb \ - freescale/fsl-ls1046a-rdb-usdpaa.dtb \ freescale/fsl-ls1046a-qds.dtb \ freescale/fsl-ls1046a-qds-sdk.dtb \ " -- 2.40.1