sunxi: rename arm926ej-s to arm9

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 8c1d5074c36180a90995d0660035589dfd06f1f5..7b606075f32440dae4fe679b60bd0e4f4c29fc63 100644 (file)
--- 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 9629bea02e27e4f00765bfc35b9ed73b0084659c..6961e9c943c52ad9f52e213c388afd8e1b1299f2 100644 (file)
--- 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/arm9/config-6.1 b/target/linux/sunxi/arm9/config-6.1
new file mode 100644 (file)
index 0000000..ba3980c
--- /dev/null
+++ b/target/linux/sunxi/arm9/config-6.1
@@ -0,0 +1,30 @@
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
+CONFIG_ARCH_MULTI_V4_V5=y
+CONFIG_ARCH_MULTI_V5=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_CPU_AUTO=y
+CONFIG_ARCH_NR_GPIO=416
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_DWMAC_SUN8I=y
+CONFIG_MACH_SUNIV=y
+# CONFIG_MACH_SUN4I is not set
+# CONFIG_MACH_SUN5I is not set
+CONFIG_MDIO_BUS_MUX=y
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
+CONFIG_UNWINDER_ARM=y
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_SUNIV_F1C100S_CCU=y
\ No newline at end of file

diff --git a/target/linux/sunxi/arm9/target.mk b/target/linux/sunxi/arm9/target.mk
new file mode 100644 (file)
index 0000000..f37aa30
--- /dev/null
+++ b/target/linux/sunxi/arm9/target.mk
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2024 Zoltan HERPAI
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+BOARDNAME:=Allwinner F1C100/200s
+CPU_TYPE:=arm926ej-s

diff --git a/target/linux/sunxi/arm926ej-s/config-6.1 b/target/linux/sunxi/arm926ej-s/config-6.1
deleted file mode 100644 (file)
index ba3980c..0000000
--- a/target/linux/sunxi/arm926ej-s/config-6.1
+++ /dev/null
@@ -1,30 +0,0 @@
-# CONFIG_ARCH_MULTI_V4 is not set
-# CONFIG_ARCH_MULTI_V4T is not set
-CONFIG_ARCH_MULTI_V4_V5=y
-CONFIG_ARCH_MULTI_V5=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_CPU_AUTO=y
-CONFIG_ARCH_NR_GPIO=416
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_DWMAC_SUN8I=y
-CONFIG_MACH_SUNIV=y
-# CONFIG_MACH_SUN4I is not set
-# CONFIG_MACH_SUN5I is not set
-CONFIG_MDIO_BUS_MUX=y
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
-# CONFIG_PINCTRL_SUN50I_H6 is not set
-# CONFIG_PINCTRL_SUN50I_H6_R is not set
-CONFIG_UNWINDER_ARM=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_SUNIV_F1C100S_CCU=y
\ No newline at end of file

diff --git a/target/linux/sunxi/arm926ej-s/target.mk b/target/linux/sunxi/arm926ej-s/target.mk
deleted file mode 100644 (file)
index f37aa30..0000000
--- a/target/linux/sunxi/arm926ej-s/target.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2024 Zoltan HERPAI
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-BOARDNAME:=Allwinner F1C100/200s
-CPU_TYPE:=arm926ej-s

diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile
index 1a12e6785d1d0148427b711f8137978a87111836..163a55d45e58cafc4c548accce309b776ddcb350 100644 (file)
--- 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/arm9.mk b/target/linux/sunxi/image/arm9.mk
new file mode 100644 (file)
index 0000000..4015012
--- /dev/null
+++ b/target/linux/sunxi/image/arm9.mk
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2013-2024 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+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_licheepi-nano

diff --git a/target/linux/sunxi/image/arm926ej-s.mk b/target/linux/sunxi/image/arm926ej-s.mk
deleted file mode 100644 (file)
index 398382a..0000000
--- a/target/linux/sunxi/image/arm926ej-s.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2013-2024 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Device/licheepi-nano
-  DEVICE_VENDOR := LicheePi
-  DEVICE_MODEL := Nano
-  DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-rtl8192cu
-  SOC := suniv-f1c100s
-endef
-TARGET_DEVICES += licheepi-nano