sunxi: add F1C100 (arm926ej-s) support

Instead of creating a separate suniv target, as both the kernel and u-boot
supports enough of this SoC by now, let's dump it into the sunxi target.

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

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 14fdfc2e57ef51a3fe4180cb7693b117502e61a9..8c1d5074c36180a90995d0660035589dfd06f1f5 100644 (file)
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -140,6 +140,12 @@ define U-Boot/Linksprite_pcDuino
   BUILD_DEVICES:=linksprite_a10-pcduino
 endef
 
+define U-Boot/licheepi_nano
+  BUILD_SUBTARGET:=arm926ej-s
+  NAME:=LicheePi Nano
+  BUILD_DEVICES:=licheepi_licheepi-nano
+endef
+
 define U-Boot/LicheePi_Zero
   BUILD_SUBTARGET:=cortexa7
   NAME:=Lichee Pi Zero V3s
@@ -402,6 +408,7 @@ UBOOT_TARGETS := \
        Mele_M9 \
        Merrii_A80_Optimus \
        OLIMEX_A13_SOM \
+       licheepi_nano \
        LicheePi_Zero \
        Linksprite_pcDuino \
        Linksprite_pcDuino3 \

diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
index 4ed94d36a35763cb0a8aabadd09bc115041a8075..9629bea02e27e4f00765bfc35b9ed73b0084659c 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
+SUBTARGETS:=cortexa8 cortexa7 cortexa53 arm926ej-s
 
 KERNEL_PATCHVER:=6.1
 KERNEL_TESTING_PATCHVER:=6.6

diff --git a/target/linux/sunxi/arm926ej-s/config-6.1 b/target/linux/sunxi/arm926ej-s/config-6.1
new file mode 100644 (file)
index 0000000..ba3980c
--- /dev/null
+++ b/target/linux/sunxi/arm926ej-s/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/arm926ej-s/target.mk b/target/linux/sunxi/arm926ej-s/target.mk
new file mode 100644 (file)
index 0000000..f37aa30
--- /dev/null
+++ b/target/linux/sunxi/arm926ej-s/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/config-6.1 b/target/linux/sunxi/config-6.1
index dd78165049ae2d3e532a5378733e5e82145c77a0..b8cb2e2cba29d5db4fe3a936581f643a421f950d 100644 (file)
--- a/target/linux/sunxi/config-6.1
+++ b/target/linux/sunxi/config-6.1
@@ -6,8 +6,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_NR_GPIO=416
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y

diff --git a/target/linux/sunxi/config-6.6 b/target/linux/sunxi/config-6.6
index a76834c13a99787d3c9c7cc4853036414187eaaf..661c511ee501808e6971062bc4eec32b0fbce2cf 100644 (file)
--- a/target/linux/sunxi/config-6.6
+++ b/target/linux/sunxi/config-6.6
@@ -7,8 +7,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_NR_GPIO=416
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y

diff --git a/target/linux/sunxi/cortexa7/config-6.1 b/target/linux/sunxi/cortexa7/config-6.1
index e911da4c3d5934ebd33555879eb4f8de0c33ae8a..76fdc0dff3ac0c9d5116b932244c5988b9b3f088 100644 (file)
--- a/target/linux/sunxi/cortexa7/config-6.1
+++ b/target/linux/sunxi/cortexa7/config-6.1
@@ -1,3 +1,5 @@
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
 CONFIG_B53=y
 CONFIG_B53_MDIO_DRIVER=y
 CONFIG_CRYPTO_BLAKE2S_ARM=y

diff --git a/target/linux/sunxi/cortexa8/config-6.1 b/target/linux/sunxi/cortexa8/config-6.1
index b893b3142e0e115e346b553fbd6a5a72581dee37..274778dd09011f8dbd6a5aa65e3ce54b4c793845 100644 (file)
--- a/target/linux/sunxi/cortexa8/config-6.1
+++ b/target/linux/sunxi/cortexa8/config-6.1
@@ -1,3 +1,5 @@
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
 # CONFIG_ARM_LPAE is not set
 CONFIG_CRYPTO_BLAKE2S_ARM=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y

diff --git a/target/linux/sunxi/image/arm926ej-s.mk b/target/linux/sunxi/image/arm926ej-s.mk
new file mode 100644 (file)
index 0000000..398382a
--- /dev/null
+++ b/target/linux/sunxi/image/arm926ej-s.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-nano
+  DEVICE_VENDOR := LicheePi
+  DEVICE_MODEL := Nano
+  DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-rtl8192cu
+  SOC := suniv-f1c100s
+endef
+TARGET_DEVICES += licheepi-nano