suniv: refresh target

Signed-off-by: Zoltan HERPAI <[email protected]>

diff --git a/package/boot/uboot-suniv/Makefile b/package/boot/uboot-suniv/Makefile
index 51de94cf3f03685fcd0f03e4df00533fc188f37d..7951ff93a288e94e193382fcd4f7cefdfe1a8ecf 100644 (file)
--- a/package/boot/uboot-suniv/Makefile
+++ b/package/boot/uboot-suniv/Makefile
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2013-2021 OpenWrt.org
 # Copyright (C) 2017 Yousong Zhou
-# Copyright (C) 2021 Zoltan Herpai
+# Copyright (C) 2024 Zoltan Herpai
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

diff --git a/target/linux/suniv/Makefile b/target/linux/suniv/Makefile
index fa108751599b1e48e32980e3fdc5b87c84ee5c89..f83e6e73cd6b1353b0ab3c4df03e25c991046064 100644 (file)
--- a/target/linux/suniv/Makefile
+++ b/target/linux/suniv/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 OpenWrt.org
+# Copyright (C) 2024 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=suniv
 BOARDNAME:=Allwinner F1C-series
-FEATURES:=gpio ramdisk rtc squashfs
+FEATURES:=gpio ramdisk rtc squashfs ext4
 DEVICE_TYPE:=developerboard
 SUBTARGETS:=arm926ej-s
 

diff --git a/target/linux/suniv/arm926ej-s/config-5.4 b/target/linux/suniv/arm926ej-s/config-5.4
deleted file mode 100644 (file)
index 0b36970..0000000
--- a/target/linux/suniv/arm926ej-s/config-5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-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_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

diff --git a/target/linux/suniv/arm926ej-s/config-6.1 b/target/linux/suniv/arm926ej-s/config-6.1
new file mode 100644 (file)
index 0000000..0b36970
--- /dev/null
+++ b/target/linux/suniv/arm926ej-s/config-6.1
@@ -0,0 +1,15 @@
+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_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

diff --git a/target/linux/suniv/config-6.1 b/target/linux/suniv/config-6.1
index 8ce34b703af8fcce470ae5bbf9f2463d32e3810a..6b5cffed67c8f2a8af1db374071a1aea50fc6ef3 100644 (file)
--- a/target/linux/suniv/config-6.1
+++ b/target/linux/suniv/config-6.1
@@ -1,8 +1,8 @@
 CONFIG_AHCI_SUNXI=m
 # CONFIG_AIO is not set
 CONFIG_ALIGNMENT_TRAP=y
+CONFIG_APERTURE_HELPERS=y
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -14,6 +14,8 @@ CONFIG_ARCH_MULTI_V4_V5=y
 CONFIG_ARCH_MULTI_V5=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_SUSPEND_POSSIBLE=y
 CONFIG_ARM=y
@@ -22,7 +24,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_THUMB=y
@@ -39,10 +41,11 @@ CONFIG_BINFMT_MISC=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_PM=y
-CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BOUNCE=y
 CONFIG_CAN=y
-CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLK_SUNXI=y
 CONFIG_CLK_SUNXI_CLOCKS=y
@@ -51,10 +54,13 @@ CONFIG_CLK_SUNXI_PRCM_SUN8I=y
 CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
 CONFIG_COREDUMP=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CPUFREQ_DT=y
@@ -78,6 +84,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_THERMAL=y
@@ -89,22 +96,22 @@ CONFIG_CRASH_DUMP=y
 CONFIG_CRC16=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=y
+# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_DEV_SUN8I_CE is not set
+# CONFIG_CRYPTO_DEV_SUN8I_SS is not set
 CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
@@ -115,17 +122,19 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
-CONFIG_DMA_REMAP=y
+CONFIG_DMA_OPS=y
+# CONFIG_DMA_SUN6I is not set
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_DVB_CORE=y
 CONFIG_DWMAC_GENERIC=y
 # CONFIG_DWMAC_SUN8I is not set
 CONFIG_DWMAC_SUNXI=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ELF_CORE=y
-CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_F2FS_FS=y
@@ -148,11 +157,15 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAME_WARN=2048
 CONFIG_FREEZER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_FW_CACHE=y
 CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
@@ -160,10 +173,10 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PINCONF=y
@@ -172,8 +185,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GLOB=y
-CONFIG_GPIOLIB=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_GPIO_CDEV=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -184,8 +196,6 @@ CONFIG_HWMON=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=y
-CONFIG_HZ=100
-CONFIG_HZ_100=y
 CONFIG_HZ_FIXED=0
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -211,7 +221,6 @@ CONFIG_IPV6=y
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_PIMSM_V2 is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_COMMON=y
@@ -223,6 +232,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IRQCHIP=y
+CONFIG_IRQSTACKS=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
@@ -232,6 +242,8 @@ CONFIG_KALLSYMS_UNCOMPRESSED=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYBOARD_SUN4I_LRADC=y
+CONFIG_KMAP_LOCAL=y
+CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 CONFIG_KSM=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
@@ -248,8 +260,18 @@ CONFIG_MACH_SUNIV=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_SUN4I=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+CONFIG_MEDIA_TUNER=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
@@ -281,25 +303,22 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NET_INGRESS=y
 CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NET_SELFTESTS=y
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_RTCACHE=m
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NF_FLOW_TABLE_HW=m
-CONFIG_NF_LOG_COMMON=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_LOG_SYSLOG=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NF_NAT_REDIRECT=y
@@ -312,6 +331,7 @@ CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
@@ -321,27 +341,36 @@ CONFIG_OF_GPIO=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_NET=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 # CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCS_XPCS=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
+CONFIG_PHYLIB_LEDS=y
 CONFIG_PHYLINK=y
 CONFIG_PHY_SUN4I_USB=y
+# CONFIG_PHY_SUN50I_USB3 is not set
 # CONFIG_PHY_SUN6I_MIPI_DPHY is not set
 # CONFIG_PHY_SUN9I_USB is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AXP209=y
 # CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_SUN20I_D1 is not set
 # CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN50I_A100 is not set
+# CONFIG_PINCTRL_SUN50I_A100_R is not set
 # 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_H616 is not set
+# CONFIG_PINCTRL_SUN50I_H616_R is not set
 # CONFIG_PINCTRL_SUN50I_H6_R is not set
 # CONFIG_PINCTRL_SUN5I is not set
 # CONFIG_PINCTRL_SUN6I_A31 is not set
@@ -370,6 +399,7 @@ CONFIG_PPP_ASYNC=m
 CONFIG_PPS=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPTION=y
+CONFIG_PREEMPT_BUILD=y
 CONFIG_PREEMPT_COUNT=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_RCU=y
@@ -377,13 +407,12 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PROC_EVENTS=y
 CONFIG_PROC_VMCORE=y
 CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_PWM=y
 CONFIG_PWM_SUN4I=y
 CONFIG_PWM_SYSFS=y
+CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
@@ -402,11 +431,12 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RTC_MC146818_LIB=y
 CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_HOST=y
 CONFIG_SATA_PMP=y
 CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=y
 CONFIG_SDIO_UART=y
 CONFIG_SECURITYFS=y
-# CONFIG_SENSORS_DRIVETEMP is not set
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_DWLIB=y
@@ -428,6 +458,8 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SUN4I_I2S is not set
 # CONFIG_SND_SUN4I_SPDIF is not set
+# CONFIG_SND_SUN50I_DMIC is not set
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SPARSE_IRQ=y
@@ -441,14 +473,16 @@ CONFIG_SRCU=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PLATFORM=y
-# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_SUN4I_EMAC=m
+CONFIG_SUN4I_INTC=y
 CONFIG_SUN4I_TIMER=y
-# CONFIG_SUN8I_A83T_CCU is not set
+CONFIG_SUN6I_RTC_CCU=y
 CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_R_CCU=y
+# CONFIG_SUN8I_THERMAL is not set
 CONFIG_SUNIV_F1C100S_CCU=y
 CONFIG_SUNXI_CCU=y
+CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_RSB=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_SUNXI_WATCHDOG=y
@@ -467,11 +501,12 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
+CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
 CONFIG_TOUCHSCREEN_SUN4I=y
+CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
@@ -487,6 +522,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USERIO=y
@@ -494,8 +530,8 @@ CONFIG_USE_OF=y
 CONFIG_VFAT_FS=y
 CONFIG_VFP=y
 CONFIG_VHOST=y
+CONFIG_VHOST_IOTLB=y
 CONFIG_VHOST_NET=y
-CONFIG_VIRTUALIZATION=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y

diff --git a/target/linux/suniv/image/Config.in b/target/linux/suniv/image/Config.in
index 1146d94984b41e51944f1b06cac7226c84dc45bb..ce1cfc7f9e7a2dbb6723d623bc2271b82910113e 100644 (file)
--- a/target/linux/suniv/image/Config.in
+++ b/target/linux/suniv/image/Config.in
@@ -1,4 +1,4 @@
-config SUNXI_SD_BOOT_PARTSIZE
+config SUNIV_SD_BOOT_PARTSIZE
        int "Boot (SD Card) filesystem partition size (in MB)"
        depends on TARGET_suniv
        default 20

diff --git a/target/linux/suniv/image/Makefile b/target/linux/suniv/image/Makefile
index 01e9742b4602a4e72d086a868fe995c98201d70a..2ba5da66fd17a4dfa9e73fffcd11c278d0cde0e4 100644 (file)
--- a/target/linux/suniv/image/Makefile
+++ b/target/linux/suniv/image/Makefile
@@ -9,22 +9,22 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 FAT32_BLOCK_SIZE=1024
-FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
+FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNIV_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
 DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR
 KERNEL_LOADADDR:=0x40008000
 
-define Build/sunxi-sdcard
+define Build/suniv-sdcard
        rm -f [email protected]
        mkfs.fat [email protected] -C $(FAT32_BLOCKS)
 
        mcopy -i [email protected] $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-boot.scr ::boot.scr
        mcopy -i [email protected] $(DTS_DIR)/$(SUNXI_DTS).dtb ::dtb
        mcopy -i [email protected] $(IMAGE_KERNEL) ::uImage
-       ./gen_sunxi_sdcard_img.sh $@ \
+       ./gen_suniv_sdcard_img.sh $@ \
                [email protected] \
                $(IMAGE_ROOTFS) \
-               $(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
+               $(CONFIG_SUNIV_SD_BOOT_PARTSIZE) \
                $(CONFIG_TARGET_ROOTFS_PARTSIZE) \
                $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-u-boot-with-spl.bin
        rm -f [email protected]
@@ -36,7 +36,7 @@ define Device/Default
   KERNEL_NAME := zImage
   KERNEL := kernel-bin | uImage none
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip
+  IMAGE/sdcard.img.gz := suniv-sdcard | append-metadata | gzip
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   SUNXI_DTS_DIR :=
   SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))

diff --git a/target/linux/suniv/image/arm926ej-s.mk b/target/linux/suniv/image/arm926ej-s.mk
index 958447d3970d9154e760cb4163917d8fd698c18a..398382a7ad61127e65407a98222a2c4a1b6d1d23 100644 (file)
--- a/target/linux/suniv/image/arm926ej-s.mk
+++ b/target/linux/suniv/image/arm926ej-s.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2021 OpenWrt.org
+# Copyright (C) 2013-2024 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,12 +12,3 @@ define Device/licheepi-nano
   SOC := suniv-f1c100s
 endef
 TARGET_DEVICES += licheepi-nano
-
-#define Device/cubietech_a10-cubieboard
-#  DEVICE_VENDOR := Cubietech
-#  DEVICE_MODEL := Cubieboard
-#  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
-#  SOC := sun4i
-#endef
-#TARGET_DEVICES += cubietech_a10-cubieboard
-

diff --git a/target/linux/suniv/image/gen_suniv_sdcard_img.sh b/target/linux/suniv/image/gen_suniv_sdcard_img.sh
new file mode 100755 (executable)
index 0000000..7dc2276
--- /dev/null
+++ b/target/linux/suniv/image/gen_suniv_sdcard_img.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+set -ex
+[ $# -eq 6 ] || {
+    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
+    exit 1
+}
+
+OUTPUT="$1"
+BOOTFS="$2"
+ROOTFS="$3"
+BOOTFSSIZE="$4"
+ROOTFSSIZE="$5"
+UBOOT="$6"
+
+head=4
+sect=63
+
+set $(ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M)
+
+BOOTOFFSET="$(($1 / 512))"
+BOOTSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
+
+dd bs=1024 if="$UBOOT" of="$OUTPUT" seek=8 conv=notrunc
+dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
+dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc

diff --git a/target/linux/suniv/image/gen_sunxi_sdcard_img.sh b/target/linux/suniv/image/gen_sunxi_sdcard_img.sh
deleted file mode 100755 (executable)
index 7dc2276..0000000
--- a/target/linux/suniv/image/gen_sunxi_sdcard_img.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-set -ex
-[ $# -eq 6 ] || {
-    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
-    exit 1
-}
-
-OUTPUT="$1"
-BOOTFS="$2"
-ROOTFS="$3"
-BOOTFSSIZE="$4"
-ROOTFSSIZE="$5"
-UBOOT="$6"
-
-head=4
-sect=63
-
-set $(ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M)
-
-BOOTOFFSET="$(($1 / 512))"
-BOOTSIZE="$(($2 / 512))"
-ROOTFSOFFSET="$(($3 / 512))"
-ROOTFSSIZE="$(($4 / 512))"
-
-dd bs=1024 if="$UBOOT" of="$OUTPUT" seek=8 conv=notrunc
-dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
-dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc

diff --git a/target/linux/suniv/patches-6.1/0001-series.patch b/target/linux/suniv/patches-6.1/0001-series.patch
deleted file mode 100644 (file)
index 3140564..0000000
--- a/target/linux/suniv/patches-6.1/0001-series.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Allwinner ARMv5 F1C100s has similar sram controller to sun4i A10
-Add compatible strings for it.
-
-Signed-off-by: Mesih Kilinc <[email protected]>
-Acked-by: Maxime Ripard <[email protected]>
----
- drivers/soc/sunxi/sunxi_sram.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
-index b4b0f34..27f0607 100644
---- a/drivers/soc/sunxi/sunxi_sram.c
-+++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -99,6 +99,10 @@ static const struct of_device_id sunxi_sram_dt_ids[] = {
-               .compatible     = "allwinner,sun50i-a64-sram-c",
-               .data           = &sun50i_a64_sram_c.data,
-       },
-+      {
-+              .compatible     = "allwinner,suniv-f1c100s-sram-d",
-+              .data           = &sun4i_a10_sram_d.data,
-+      },
-       {}
- };
- 
-@@ -389,6 +393,10 @@ static const struct of_device_id sunxi_sram_dt_match[] = {
-               .compatible = "allwinner,sun50i-a64-system-control",
-               .data = &sun50i_a64_sramc_variant,
-       },
-+      {
-+              .compatible = "allwinner,suniv-f1c100s-system-control",
-+              .data = &sun4i_a10_sramc_variant,
-+      },
-       { },
- };
- MODULE_DEVICE_TABLE(of, sunxi_sram_dt_match);
-
-Allwinner ARMv5 F1C100s has similar watchdog timer to sun6i A31.
-Add compatible string for it.
-
-Signed-off-by: Mesih Kilinc <[email protected]>
----
- drivers/watchdog/sunxi_wdt.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
-index c6c7365..bc70742 100644
---- a/drivers/watchdog/sunxi_wdt.c
-+++ b/drivers/watchdog/sunxi_wdt.c
-@@ -227,6 +227,7 @@ static const struct sunxi_wdt_reg sun6i_wdt_reg = {
- static const struct of_device_id sunxi_wdt_dt_ids[] = {
-       { .compatible = "allwinner,sun4i-a10-wdt", .data = &sun4i_wdt_reg },
-       { .compatible = "allwinner,sun6i-a31-wdt", .data = &sun6i_wdt_reg },
-+      { .compatible = "allwinner,suniv-f1c100s-wdt", .data = &sun6i_wdt_reg },
-       { /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
-