From 7727944a5c8adb759f4efd0fe6cacad78407322a Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Thu, 5 Feb 2026 15:27:47 +0000 Subject: [PATCH] sunxi: 6.18: add missing symbols Add sunxi-related missing symbols that were found during 6.18 migration, and reorder configs. Signed-off-by: Zoltan HERPAI --- target/linux/sunxi/arm926ejs/config-6.12 | 16 ++++++++-------- target/linux/sunxi/config-6.18 | 6 ++++++ target/linux/sunxi/cortexa53/config-6.18 | 4 ++++ target/linux/sunxi/cortexa8/config-6.12 | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/target/linux/sunxi/arm926ejs/config-6.12 b/target/linux/sunxi/arm926ejs/config-6.12 index 8625b9751b2..771f130cdea 100644 --- a/target/linux/sunxi/arm926ejs/config-6.12 +++ b/target/linux/sunxi/arm926ejs/config-6.12 @@ -1,28 +1,28 @@ +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_ARCH_HAS_BINFMT_FLAT=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_CPU_AUTO=y # 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_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set -CONFIG_MACH_SUNIV=y +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN8I is not set # CONFIG_MACH_SUN9I is not set +CONFIG_MACH_SUNIV=y CONFIG_MDIO_BUS_MUX=y CONFIG_MTD_SPI_NAND=y CONFIG_MUSB_PIO_ONLY=y @@ -51,6 +51,6 @@ CONFIG_PINCTRL_SUNIV_F1C100S=y CONFIG_PINCTRL_SUNXI=y CONFIG_SUNIV_F1C100S_CCU=y CONFIG_UNWINDER_ARM=y -CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_SUNXI=y diff --git a/target/linux/sunxi/config-6.18 b/target/linux/sunxi/config-6.18 index 5362d3e0805..9ef05576553 100644 --- a/target/linux/sunxi/config-6.18 +++ b/target/linux/sunxi/config-6.18 @@ -152,6 +152,7 @@ CONFIG_DTC=y CONFIG_DUMMY_CONSOLE=y CONFIG_DVB_CORE=y CONFIG_DWMAC_GENERIC=y +# CONFIG_DWMAC_SUN55I is not set # CONFIG_DWMAC_SUN8I is not set CONFIG_DWMAC_SUNXI=y CONFIG_DYNAMIC_DEBUG=y @@ -348,6 +349,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PCS_XPCS=y @@ -374,6 +376,8 @@ CONFIG_PINCTRL=y # 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_SUN55I_A523 is not set +# CONFIG_PINCTRL_SUN55I_A523_R is not set # CONFIG_PINCTRL_SUN5I is not set # CONFIG_PINCTRL_SUN6I_A31 is not set # CONFIG_PINCTRL_SUN6I_A31_R is not set @@ -476,6 +480,8 @@ CONFIG_STMMAC_PLATFORM=y CONFIG_SUN4I_A10_CCU=y # CONFIG_SUN4I_EMAC is not set CONFIG_SUN4I_TIMER=y +# CONFIG_SUN50I_H6_PRCM_PPU is not set +# CONFIG_SUN55I_PCK600 is not set CONFIG_SUN5I_CCU=y CONFIG_SUN5I_HSTIMER=y CONFIG_SUN6I_A31_CCU=y diff --git a/target/linux/sunxi/cortexa53/config-6.18 b/target/linux/sunxi/cortexa53/config-6.18 index 9c650f1c4de..65ee51de311 100644 --- a/target/linux/sunxi/cortexa53/config-6.18 +++ b/target/linux/sunxi/cortexa53/config-6.18 @@ -22,6 +22,7 @@ CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y CONFIG_ARM64_ERRATUM_827319=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_GCS=y CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_PA_BITS=48 CONFIG_ARM64_PA_BITS_48=y @@ -119,6 +120,9 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y CONFIG_SUN50I_H616_CCU=y CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y +# CONFIG_SUN55I_A523_CCU is not set +# CONFIG_SUN55I_A523_MCU_CCU is not set +# CONFIG_SUN55I_A523_R_CCU is not set CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN6I_R_INTC=y CONFIG_SUNXI_NMI_INTC=y diff --git a/target/linux/sunxi/cortexa8/config-6.12 b/target/linux/sunxi/cortexa8/config-6.12 index dbf26947ab8..715d3406406 100644 --- a/target/linux/sunxi/cortexa8/config-6.12 +++ b/target/linux/sunxi/cortexa8/config-6.12 @@ -8,10 +8,10 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y # CONFIG_MACH_SUN8I is not set # CONFIG_MACH_SUN9I is not set CONFIG_PGTABLE_LEVELS=2 +# CONFIG_PHY_SUN9I_USB is not set CONFIG_PINCTRL_AXP209=y CONFIG_PINCTRL_SUN4I_A10=y CONFIG_PINCTRL_SUN5I=y -# CONFIG_PHY_SUN9I_USB is not set # CONFIG_SPI_SUN6I is not set # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_THERMAL is not set