From 192ab0903fe77ada1c4d8cabd2d5105887df038b Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 29 May 2024 16:24:09 +0200 Subject: [PATCH] tegra: add testing 6.6 kernel Preliminary support. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/Makefile | 1 + target/linux/tegra/image/Makefile | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target/linux/tegra/Makefile b/target/linux/tegra/Makefile index 43ca154e8a..3513e2751e 100644 --- a/target/linux/tegra/Makefile +++ b/target/linux/tegra/Makefile @@ -13,6 +13,7 @@ CPU_SUBTYPE := vfpv3-d16 SUBTARGETS := generic KERNEL_PATCHVER := 5.15 +KERNEL_TESTING_PATCHVER := 6.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index da0b3813bb..7103b6d36e 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -10,8 +10,8 @@ define Build/tegra-sdcard mkdir -p $@.boot $(CP) $(KDIR)/$(KERNEL_NAME) $@.boot $(if $(DEVICE_DTS),\ - $(foreach dtb,$(DEVICE_DTS),$(CP) $(DTS_DIR)/$(dtb).dtb $@.boot), \ - $(CP) $(DTS_DIR)/*.dtb $@.boot) + $(foreach dtb,$(DEVICE_DTS),$(CP) $(DEVICE_DTS_DIR)/$(dtb).dtb $@.boot), \ + $(CP) $(DEVICE_DTS_DIR)/*.dtb $@.boot) mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n '$(DEVICE_TITLE) OpenWrt bootscript' \ -d $(BOOT_SCRIPT) \ @@ -32,6 +32,11 @@ DEVICE_VARS += BOOT_SCRIPT UBOOT define Device/Default BOOT_SCRIPT := generic-bootscript +ifeq ($(KERNEL),6.6) + DEVICE_DTS_DIR := $$(DTS_DIR)/nvidia +else + DEVICE_DTS_DIR := $$(DTS_DIR) +endif IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := append-rootfs | pad-extra 128k | tegra-sdcard | gzip | append-metadata KERNEL_NAME := zImage -- 2.30.2