From 4927d0f2850efb711fd8f0e96f48869d270a6fc5 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sun, 4 Aug 2024 16:10:49 +0200 Subject: [PATCH] omap: adapt to the new dts directory layout. .dts files were moved to the 'ti/omap' sub-directory. Signed-off-by: Andre Heider Link: https://github.com/openwrt/openwrt/pull/16099 Signed-off-by: Hauke Mehrtens --- target/linux/omap/image/Makefile | 3 +++ .../patches-6.6/900-use-cpsw-ethernet-driver.patch | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index 507c91b2cc..3d8c8a2f17 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -33,6 +33,9 @@ define Device/Default PROFILES := Default KERNEL_NAME := zImage KERNEL := kernel-bin + ifdef CONFIG_LINUX_6_6 + DTS_DIR := $(DTS_DIR)/ti/omap + endif DEVICE_DTS = $(lastword $(subst _, ,$(1))) IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := omap-sdcard | append-metadata | gzip diff --git a/target/linux/omap/patches-6.6/900-use-cpsw-ethernet-driver.patch b/target/linux/omap/patches-6.6/900-use-cpsw-ethernet-driver.patch index 17c07fbdfb..31fa0028c6 100644 --- a/target/linux/omap/patches-6.6/900-use-cpsw-ethernet-driver.patch +++ b/target/linux/omap/patches-6.6/900-use-cpsw-ethernet-driver.patch @@ -17,9 +17,9 @@ devices in OpenWrt usable again with the default network config.) Signed-off-by: Jan Hoffmann --- ---- a/arch/arm/boot/dts/am335x-bone-common.dtsi -+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi -@@ -353,27 +353,24 @@ +--- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi ++++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi +@@ -358,27 +358,24 @@ }; }; @@ -52,8 +52,8 @@ Signed-off-by: Jan Hoffmann ethphy0: ethernet-phy@0 { reg = <0>; ---- a/arch/arm/boot/dts/am335x-evm.dts -+++ b/arch/arm/boot/dts/am335x-evm.dts +--- a/arch/arm/boot/dts/ti/omap/am335x-evm.dts ++++ b/arch/arm/boot/dts/ti/omap/am335x-evm.dts @@ -682,31 +682,28 @@ }; }; -- 2.30.2