From a7cb07b4bc5d00bb53621f104e9f4c9d794f3f43 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 13 Dec 2025 09:51:45 -0500 Subject: [PATCH] linux-pine64-pinenote: upgrade to 6.18.1 Part-of: --- device/testing/linux-pine64-pinenote/APKBUILD | 7 ++- .../config-pine64-pinenote.aarch64 | 39 +++++++++---- .../pmos-kconfig-default.patch | 56 ++++++++++--------- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/device/testing/linux-pine64-pinenote/APKBUILD b/device/testing/linux-pine64-pinenote/APKBUILD index 602e4f9b1..c73c3c1a6 100644 --- a/device/testing/linux-pine64-pinenote/APKBUILD +++ b/device/testing/linux-pine64-pinenote/APKBUILD @@ -2,7 +2,7 @@ # Kernel config based on: arch/arm64/configs/pinenote_defconfig # Maintainer: Antoine Martin (ayakael) pkgname=linux-pine64-pinenote -pkgver=6.18.0 +pkgver=6.18.1 _kernver=${pkgver%.*} pkgrel=0 pkgdesc="Pine64 PineNote close to mainline fork" @@ -82,6 +82,7 @@ package() { sha512sums=" 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0 linux-6.18.tar.xz f8443f7ff4262bb9361c9c29ef10b247367a80e7aebbae1efdf3aad545f95c0afc1e1c98f0b4d1e008086809c4ba2264b042178258dc4e1b5692714599e0cd26 linux-pine64-pinenote-6.18-fe4f8068cda0b9f159803cee85254b69da099057.patch -bc5a8a90592df3a997246c660a27c87e6ad1da61d779f8c5787457747c80623a9fae2df5c6a0ebdc15239e5266d5855cdb34bcf6df0221b30d66d36ae8d994d7 pmos-kconfig-default.patch -7cc9947bd1fe92d51b08e16842369a298ce36122c7e5706ecfc90b99885b11a69a9f04df66eff6fadabbe1e1918ec9e189d8e06dbcb00847f523b8e59b63637a config-pine64-pinenote.aarch64 +cbacd525c1b9144064be7b325384684258bd611181c12ef5142e80df08d1ec32b24037c711a8493e6f55ca19cf2af4b24883ca51cee4deee576168396035b1c8 pmos-kconfig-default.patch +ec0c36542714a844223e916439133537a6eda65b626cea222362b432a0fa6f7aeb6441266e9722cc891afd1cdae72a7661e001054a1577011593f4bac19ed76f config-pine64-pinenote.aarch64 +09ed1dc6b66ee15921167de612a9e5178d37dfc874731b2893a833acaaddaf929e900ba9366d3aecfd678b67a28d3889f897735c6305c2b4af87a101a84ea775 linux-pine64-pinenote-6.18.1.patch.xz " diff --git a/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 b/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 index 82868c67e..daa6e4a90 100644 --- a/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 +++ b/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 @@ -1,18 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.18.0 Kernel Configuration +# Linux/arm64 6.18.1 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.2" +CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.7" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=210102 +CONFIG_CLANG_VERSION=210107 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=210102 +CONFIG_AS_VERSION=210107 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=210102 -CONFIG_RUSTC_VERSION=0 -CONFIG_RUSTC_LLVM_VERSION=0 +CONFIG_LLD_VERSION=210107 +CONFIG_RUSTC_VERSION=109101 +CONFIG_RUSTC_LLVM_VERSION=210102 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y @@ -22,6 +22,11 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_HAS_COUNTED_BY=y CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y +CONFIG_RUSTC_HAS_COERCE_POINTEE=y +CONFIG_RUSTC_HAS_SPAN_FILE=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y +CONFIG_RUSTC_HAS_FILE_WITH_NUL=y +CONFIG_RUSTC_HAS_FILE_AS_C_STR=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -120,6 +125,7 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_LAZY is not set # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_DYNAMIC is not set +# CONFIG_SCHED_CORE is not set # # CPU/Task time and stats accounting @@ -297,6 +303,7 @@ CONFIG_CRASH_DUMP=y # end of General setup CONFIG_ARM64=y +CONFIG_RUSTC_SUPPORTS_ARM64=y CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y @@ -664,8 +671,8 @@ CONFIG_HOTPLUG_SMT=y CONFIG_ARCH_SUPPORTS_SCHED_SMT=y CONFIG_ARCH_SUPPORTS_SCHED_CLUSTER=y CONFIG_ARCH_SUPPORTS_SCHED_MC=y -# CONFIG_SCHED_SMT is not set -# CONFIG_SCHED_CLUSTER is not set +CONFIG_SCHED_SMT=y +CONFIG_SCHED_CLUSTER=y CONFIG_SCHED_MC=y CONFIG_HOTPLUG_CORE_SYNC=y CONFIG_HOTPLUG_CORE_SYNC_DEAD=y @@ -694,6 +701,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_RUST=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y @@ -731,6 +739,7 @@ CONFIG_ARCH_SUPPORTS_CFI=y CONFIG_CFI=y CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS=y +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC=y # CONFIG_CFI_PERMISSIVE is not set CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y @@ -1964,7 +1973,7 @@ CONFIG_SRAM=y # CONFIG_XILINX_SDFEC is not set # CONFIG_HISI_HIKEY_USB is not set # CONFIG_OPEN_DICE is not set -# CONFIG_NTSYNC is not set +CONFIG_NTSYNC=m # CONFIG_VCPU_STALL_DETECTOR is not set # CONFIG_MCHP_LAN966X_PCI is not set # CONFIG_C2PORT is not set @@ -7156,11 +7165,17 @@ CONFIG_FS_MBCACHE=y # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_SUPPORT_V4 is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set # CONFIG_XFS_QUOTA is not set CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set -# CONFIG_XFS_ONLINE_SCRUB is not set +CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y +CONFIG_XFS_BTREE_IN_MEM=y +CONFIG_XFS_ONLINE_SCRUB=y +CONFIG_XFS_ONLINE_SCRUB_STATS=y +CONFIG_XFS_ONLINE_REPAIR=y # CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set diff --git a/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch b/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch index 5ad61f2d2..e6b91f7a3 100644 --- a/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch +++ b/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch @@ -1,8 +1,8 @@ diff --git a/arch/arm64/configs/pinenote_defconfig.orig b/arch/arm64/configs/pinenote_defconfig -index f27b482..0443fc3 100644 +index f27b482..7dbcc93 100644 --- a/arch/arm64/configs/pinenote_defconfig.orig +++ b/arch/arm64/configs/pinenote_defconfig -@@ -1,5 +1,41 @@ +@@ -1,5 +1,43 @@ +# pmos kconfig settings +CONFIG_UEVENT_HELPER=y +CONFIG_NULL_TTY=m @@ -27,7 +27,9 @@ index f27b482..0443fc3 100644 +# CONFIG_LTO_NONE is not set +# CONFIG_LTO_CLANG_FULL is not set +CONFIG_CFI_CLANG=y ++CONFIG_CFI=y +CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y ++CONFIG_NTSYNC=m +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y +# CONFIG_CFI_PERMISSIVE is not set +CONFIG_SHADOW_CALL_STACK=y @@ -45,7 +47,7 @@ index f27b482..0443fc3 100644 CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_GENERIC_IRQ_DEBUGFS=y -@@ -16,7 +52,6 @@ CONFIG_TASK_DELAY_ACCT=y +@@ -16,7 +54,6 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y @@ -53,7 +55,7 @@ index f27b482..0443fc3 100644 CONFIG_IKCONFIG=m CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=18 -@@ -26,7 +61,7 @@ CONFIG_MEMCG=y +@@ -26,7 +63,7 @@ CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y @@ -62,7 +64,7 @@ index f27b482..0443fc3 100644 CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y -@@ -42,6 +77,7 @@ CONFIG_NAMESPACES=y +@@ -42,6 +79,7 @@ CONFIG_NAMESPACES=y CONFIG_USER_NS=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_BLK_DEV_INITRD=y @@ -70,7 +72,7 @@ index f27b482..0443fc3 100644 # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set -@@ -131,7 +167,7 @@ CONFIG_CHR_DEV_SG=m +@@ -131,7 +169,7 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_SCAN_ASYNC=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_MD=y @@ -79,7 +81,7 @@ index f27b482..0443fc3 100644 CONFIG_DM_THIN_PROVISIONING=m # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set -@@ -154,10 +190,10 @@ CONFIG_EXTCON=y +@@ -154,10 +192,10 @@ CONFIG_EXTCON=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y @@ -92,7 +94,7 @@ index f27b482..0443fc3 100644 CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y -@@ -179,7 +215,7 @@ CONFIG_TMPFS_POSIX_ACL=y +@@ -179,7 +217,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_INODE64=y CONFIG_HUGETLBFS=y CONFIG_CONFIGFS_FS=y @@ -101,7 +103,7 @@ index f27b482..0443fc3 100644 # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -@@ -208,9 +244,9 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y +@@ -208,9 +246,9 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y # CONFIG_STRICT_DEVMEM is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ANDROID_BINDER_IPC=y @@ -113,7 +115,7 @@ index f27b482..0443fc3 100644 CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_KEXEC_CORE=y -@@ -266,17 +302,17 @@ CONFIG_CRYPTO_ECDH=m +@@ -266,17 +304,17 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_CURVE25519=m @@ -135,7 +137,7 @@ index f27b482..0443fc3 100644 CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CCM=m -@@ -287,13 +323,14 @@ CONFIG_CRYPTO_ESSIV=m +@@ -287,13 +325,14 @@ CONFIG_CRYPTO_ESSIV=m CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_GHASH=m @@ -154,7 +156,7 @@ index f27b482..0443fc3 100644 CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_WP512=m -@@ -317,6 +354,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m +@@ -317,6 +356,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set @@ -162,7 +164,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/ata/Kconfig -@@ -495,7 +533,9 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y +@@ -495,7 +535,9 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y ## ## file: drivers/firmware/efi/Kconfig ## @@ -173,7 +175,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/firmware/smccc/Kconfig -@@ -544,10 +584,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m +@@ -544,10 +586,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m ## ## file: drivers/hid/Kconfig ## @@ -310,7 +312,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/hid/i2c-hid/Kconfig -@@ -586,7 +751,7 @@ CONFIG_I2C_RK3X=y +@@ -586,7 +753,7 @@ CONFIG_I2C_RK3X=y ## ## file: drivers/iio/Kconfig ## @@ -319,7 +321,7 @@ index f27b482..0443fc3 100644 CONFIG_IIO_SW_TRIGGER=m ## -@@ -609,7 +774,7 @@ CONFIG_IIO_SCMI=m +@@ -609,7 +776,7 @@ CONFIG_IIO_SCMI=m ## file: drivers/input/Kconfig ## CONFIG_INPUT_MOUSEDEV=m @@ -328,7 +330,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/input/keyboard/Kconfig -@@ -617,14 +782,19 @@ CONFIG_INPUT_EVDEV=y +@@ -617,14 +784,19 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_GPIO=y @@ -349,7 +351,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/input/mouse/Kconfig -@@ -654,13 +824,13 @@ CONFIG_ROCKCHIP_IOMMU=y +@@ -654,13 +826,13 @@ CONFIG_ROCKCHIP_IOMMU=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=y @@ -365,7 +367,7 @@ index f27b482..0443fc3 100644 CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y -@@ -672,7 +842,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y +@@ -672,7 +844,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=y CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_LEDS_TRIGGER_NETDEV=y @@ -374,7 +376,7 @@ index f27b482..0443fc3 100644 CONFIG_LEDS_TRIGGER_TTY=y ## -@@ -889,6 +1059,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y +@@ -889,6 +1061,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y ## CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -382,7 +384,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/mfd/Kconfig -@@ -1221,12 +1392,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y +@@ -1221,12 +1394,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y ## file: drivers/usb/gadget/legacy/Kconfig ## CONFIG_USB_GADGETFS=y @@ -397,7 +399,7 @@ index f27b482..0443fc3 100644 ## ## file: drivers/usb/host/Kconfig -@@ -1285,6 +1457,7 @@ CONFIG_DW_WATCHDOG=y +@@ -1285,6 +1459,7 @@ CONFIG_DW_WATCHDOG=y ## CONFIG_FILE_LOCKING=y CONFIG_NETWORK_FILESYSTEMS=y @@ -405,7 +407,7 @@ index f27b482..0443fc3 100644 ## ## file: fs/cachefiles/Kconfig -@@ -1408,6 +1581,9 @@ CONFIG_IP_NF_NAT=m +@@ -1408,6 +1583,9 @@ CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m @@ -415,7 +417,7 @@ index f27b482..0443fc3 100644 ## ## file: net/ipv6/Kconfig -@@ -1423,6 +1599,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y +@@ -1423,6 +1601,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y ## file: net/ipv6/netfilter/Kconfig ## CONFIG_IP6_NF_IPTABLES=m @@ -428,7 +430,7 @@ index f27b482..0443fc3 100644 ## ## file: net/mac80211/Kconfig -@@ -1437,6 +1619,7 @@ CONFIG_MAC80211_DEBUGFS=y +@@ -1437,6 +1621,7 @@ CONFIG_MAC80211_DEBUGFS=y ## CONFIG_NF_CONNTRACK=m CONFIG_NF_TABLES=m @@ -436,7 +438,7 @@ index f27b482..0443fc3 100644 CONFIG_NFT_CT=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_MASQ=m -@@ -1444,6 +1627,19 @@ CONFIG_NFT_REDIR=m +@@ -1444,6 +1629,19 @@ CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m @@ -456,7 +458,7 @@ index f27b482..0443fc3 100644 CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_MARK=m -@@ -1451,6 +1647,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +@@ -1451,6 +1649,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_IPVS=m CONFIG_NETFILTER_XT_MATCH_POLICY=m