From c78c93e32c78814475f24874171f110188894f07 Mon Sep 17 00:00:00 2001
From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Sun, 17 Mar 2024 18:10:35 +0000
Subject: [PATCH] sunxi: rename arm926ej-s to arm9

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---
 package/boot/uboot-sunxi/Makefile                   | 2 +-
 target/linux/sunxi/Makefile                         | 2 +-
 target/linux/sunxi/{arm926ej-s => arm9}/config-6.1  | 0
 target/linux/sunxi/{arm926ej-s => arm9}/target.mk   | 0
 target/linux/sunxi/image/Makefile                   | 8 ++++----
 target/linux/sunxi/image/{arm926ej-s.mk => arm9.mk} | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename target/linux/sunxi/{arm926ej-s => arm9}/config-6.1 (100%)
 rename target/linux/sunxi/{arm926ej-s => arm9}/target.mk (100%)
 rename target/linux/sunxi/image/{arm926ej-s.mk => arm9.mk} (78%)

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 8c1d5074c3..7b606075f3 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -141,7 +141,7 @@ define U-Boot/Linksprite_pcDuino
 endef
 
 define U-Boot/licheepi_nano
-  BUILD_SUBTARGET:=arm926ej-s
+  BUILD_SUBTARGET:=arm9
   NAME:=LicheePi Nano
   BUILD_DEVICES:=licheepi_licheepi-nano
 endef
diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
index 9629bea02e..6961e9c943 100644
--- a/target/linux/sunxi/Makefile
+++ b/target/linux/sunxi/Makefile
@@ -8,7 +8,7 @@ ARCH:=arm
 BOARD:=sunxi
 BOARDNAME:=Allwinner ARM SoCs
 FEATURES:=fpu usb ext4 display rootfs-part rtc squashfs
-SUBTARGETS:=cortexa8 cortexa7 cortexa53 arm926ej-s
+SUBTARGETS:=cortexa8 cortexa7 cortexa53 arm9
 
 KERNEL_PATCHVER:=6.1
 KERNEL_TESTING_PATCHVER:=6.6
diff --git a/target/linux/sunxi/arm926ej-s/config-6.1 b/target/linux/sunxi/arm9/config-6.1
similarity index 100%
rename from target/linux/sunxi/arm926ej-s/config-6.1
rename to target/linux/sunxi/arm9/config-6.1
diff --git a/target/linux/sunxi/arm926ej-s/target.mk b/target/linux/sunxi/arm9/target.mk
similarity index 100%
rename from target/linux/sunxi/arm926ej-s/target.mk
rename to target/linux/sunxi/arm9/target.mk
diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile
index 1a12e6785d..163a55d45e 100644
--- a/target/linux/sunxi/image/Makefile
+++ b/target/linux/sunxi/image/Makefile
@@ -35,11 +35,11 @@ define Device/Default
   KERNEL := kernel-bin | uImage none
   IMAGES := sdcard.img.gz
   IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip
-ifneq ($(LINUX_6_1),)
+#ifneq ($(LINUX_6_1),)
   SUNXI_DTS_DIR :=
-else
-  SUNXI_DTS_DIR :=allwinner/
-endif
+#else
+#  SUNXI_DTS_DIR :=allwinner/
+#endif
   SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))
 endef
 
diff --git a/target/linux/sunxi/image/arm926ej-s.mk b/target/linux/sunxi/image/arm9.mk
similarity index 78%
rename from target/linux/sunxi/image/arm926ej-s.mk
rename to target/linux/sunxi/image/arm9.mk
index 398382a7ad..40150129a5 100644
--- a/target/linux/sunxi/image/arm926ej-s.mk
+++ b/target/linux/sunxi/image/arm9.mk
@@ -5,10 +5,10 @@
 # See /LICENSE for more information.
 #
 
-define Device/licheepi-nano
+define Device/licheepi_licheepi-nano
   DEVICE_VENDOR := LicheePi
   DEVICE_MODEL := Nano
   DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-rtl8192cu
   SOC := suniv-f1c100s
 endef
-TARGET_DEVICES += licheepi-nano
+TARGET_DEVICES += licheepi_licheepi-nano
-- 
2.30.2