From: Pawel Dembicki Date: Wed, 27 Mar 2024 12:08:39 +0000 (+0100) Subject: layerscape: adjust dts path in image scripts X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d73a66be61a3a8a2ae3b420485346aa4cd6e1b73;p=openwrt%2Fstaging%2Fblocktrron.git layerscape: adjust dts path in image scripts After the spliting dts folder of ARM architecture in upstream, layerscape routines need to be adjusted for new solution. Signed-off-by: Pawel Dembicki --- diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile index f2ac9b6f04..a4885e8912 100644 --- a/target/linux/layerscape/image/Makefile +++ b/target/linux/layerscape/image/Makefile @@ -33,7 +33,7 @@ define Build/ls-append endef define Build/ls-append-dtb - dd if=$(DTS_DIR)/$(1).dtb >> $@ + dd if=$(DEVICE_DTS_DIR)/$(1).dtb >> $@ endef define Build/ls-append-kernel diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk index fe396212e7..916f92eacf 100644 --- a/target/linux/layerscape/image/armv7.mk +++ b/target/linux/layerscape/image/armv7.mk @@ -6,8 +6,13 @@ define Device/Default PROFILES := Default FILESYSTEMS := squashfs IMAGES := firmware.bin sysupgrade.bin +ifdef CONFIG_LINUX_6_1 + DEVICE_DTS_DIR := $(DTS_DIR) +else + DEVICE_DTS_DIR := $(DTS_DIR)/nxp/ls +endif KERNEL := kernel-bin | uImage none - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL_NAME := zImage KERNEL_LOADADDR := 0x80008000 DEVICE_DTS = $(lastword $(subst _, ,$(1))) @@ -20,7 +25,7 @@ define Device/Default endef define Device/fsl-sdboot - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb IMAGES := sdcard.img.gz sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index 259bacee31..4bce779984 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -5,11 +5,12 @@ define Device/Default PROFILES := Default IMAGES := firmware.bin sysupgrade.bin + DEVICE_DTS_DIR := $(DTS_DIR)/freescale + DEVICE_DTS = $(subst _,-,$(1)) FILESYSTEMS := squashfs KERNEL := kernel-bin | gzip | uImage gzip - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL_LOADADDR := 0x80000000 - DEVICE_DTS = freescale/$(subst _,-,$(1)) IMAGE_SIZE := 64m IMAGE/sysupgrade.bin = \ ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ @@ -19,7 +20,7 @@ define Device/Default endef define Device/fsl-sdboot - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb IMAGES := sdcard.img.gz sysupgrade.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef @@ -45,7 +46,7 @@ define Device/fsl_ls1012a-frdm append-kernel | pad-to $$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata - KERNEL := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL := kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb endef TARGET_DEVICES += fsl_ls1012a-frdm @@ -81,7 +82,7 @@ define Device/fsl_ls1012a-frwy-sdboot layerscape-ppfe \ trusted-firmware-a-ls1012a-frwy-sdboot \ kmod-ppfe - DEVICE_DTS := freescale/fsl-ls1012a-frwy + DEVICE_DTS := fsl-ls1012a-frwy IMAGES += firmware.bin IMAGE/firmware.bin := \ ls-clean | \ @@ -102,8 +103,7 @@ define Device/fsl_ls1028a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1028A-RDB DEVICE_VARIANT := Default - DEVICE_DTS := freescale/fsl-ls1028a-rdb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb DEVICE_PACKAGES += \ trusted-firmware-a-ls1028a-rdb \ kmod-hwmon-ina2xx \ @@ -128,7 +128,7 @@ define Device/fsl_ls1028a-rdb-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := LS1028A-RDB DEVICE_VARIANT := SD Card Boot - DEVICE_DTS := freescale/fsl-ls1028a-rdb + DEVICE_DTS := fsl-ls1028a-rdb DEVICE_PACKAGES += \ trusted-firmware-a-ls1028a-rdb-sdboot \ kmod-hwmon-ina2xx \ @@ -157,7 +157,6 @@ define Device/fsl_ls1043a-rdb kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 - DEVICE_DTS := freescale/fsl-ls1043a-rdb IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -183,7 +182,7 @@ define Device/fsl_ls1043a-rdb-sdboot kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 - DEVICE_DTS := freescale/fsl-ls1043a-rdb + DEVICE_DTS := fsl-ls1043a-rdb IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -203,7 +202,6 @@ define Device/fsl_ls1046a-frwy DEVICE_PACKAGES += \ layerscape-fman \ trusted-firmware-a-ls1046a-frwy - DEVICE_DTS := freescale/fsl-ls1046a-frwy IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -224,7 +222,7 @@ define Device/fsl_ls1046a-frwy-sdboot DEVICE_PACKAGES += \ layerscape-fman \ trusted-firmware-a-ls1046a-frwy-sdboot - DEVICE_DTS := freescale/fsl-ls1046a-frwy + DEVICE_DTS := fsl-ls1046a-frwy IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -249,7 +247,6 @@ define Device/fsl_ls1046a-rdb kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 - DEVICE_DTS := freescale/fsl-ls1046a-rdb IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -275,7 +272,7 @@ define Device/fsl_ls1046a-rdb-sdboot kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 - DEVICE_DTS := freescale/fsl-ls1046a-rdb + DEVICE_DTS := fsl-ls1046a-rdb IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -329,7 +326,7 @@ define Device/fsl_ls1088a-rdb-sdboot kmod-ahci-qoriq \ kmod-hwmon-ina2xx \ kmod-hwmon-lm90 - DEVICE_DTS := freescale/fsl-ls1088a-rdb + DEVICE_DTS := fsl-ls1088a-rdb IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -404,7 +401,7 @@ define Device/fsl_lx2160a-rdb-sdboot layerscape-ddr-phy \ trusted-firmware-a-lx2160a-rdb-sdboot \ restool - DEVICE_DTS := freescale/fsl-lx2160a-rdb + DEVICE_DTS := fsl-lx2160a-rdb IMAGE/sdcard.img.gz := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -438,7 +435,7 @@ define Device/traverse_ten64_mtd KERNEL_ENTRY_POINT := 0x80000000 FDT_LOADADDR := 0x90000000 KERNEL_SUFFIX := -kernel.itb - DEVICE_DTS := freescale/fsl-ls1088a-ten64 + DEVICE_DTS := fsl-ls1088a-ten64 IMAGES := nand.ubi sysupgrade.bin KERNEL := kernel-bin | gzip | traverse-fit-ls1088 gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb $$(FDT_LOADADDR) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata