From 83035a44a7853a7fe2d81edb955e9f36a7c9e250 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Wed, 3 Nov 2021 10:36:35 +0100 Subject: [PATCH] layerscape: armv8_64b: use non-SDK dts files for linux-5.10 or newer Since we decided to drop the LSDK patches with linux-5.10, we now have to switch to the corresponding upstream dts files as well. Signed-off-by: Martin Schiller --- target/linux/layerscape/image/armv8_64b.mk | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index 7ff49c6555..a4d1bfab3b 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -115,7 +115,11 @@ define Device/fsl_ls1043a-rdb kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk +else + DEVICE_DTS := freescale/fsl-ls1043a-rdb +endif IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -141,7 +145,11 @@ define Device/fsl_ls1043a-rdb-sdboot kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk +else + DEVICE_DTS := freescale/fsl-ls1043a-rdb +endif IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -161,7 +169,11 @@ define Device/fsl_ls1046a-frwy DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1046a-frwy +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1046a-frwy-sdk +else + DEVICE_DTS := freescale/fsl-ls1046a-frwy +endif IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -182,7 +194,11 @@ define Device/fsl_ls1046a-frwy-sdboot DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1046a-frwy-sdboot +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1046a-frwy-sdk +else + DEVICE_DTS := freescale/fsl-ls1046a-frwy +endif IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -207,7 +223,11 @@ define Device/fsl_ls1046a-rdb kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk +else + DEVICE_DTS := freescale/fsl-ls1046a-rdb +endif IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -233,7 +253,11 @@ define Device/fsl_ls1046a-rdb-sdboot kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 +ifdef CONFIG_LINUX_5_4 DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk +else + DEVICE_DTS := freescale/fsl-ls1046a-rdb +endif IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ -- 2.30.2