From f2c8f9c50cf9d031c1e70003391ac09a70c957fd Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 6 Oct 2023 19:58:34 +0200 Subject: [PATCH] Bumo Allwinner kernels and update config with a new tooling --- config/kernel/linux-sunxi-current.config | 20 ++++++++----------- config/kernel/linux-sunxi-edge.config | 19 +++++++++--------- config/kernel/linux-sunxi-legacy.config | 9 +++++---- config/kernel/linux-sunxi64-current.config | 6 +++++- config/kernel/linux-sunxi64-edge.config | 6 +++++- config/kernel/linux-sunxi64-legacy.config | 11 +++++----- .../families/include/sunxi64_common.inc | 6 +++--- .../sources/families/include/sunxi_common.inc | 6 +++--- 8 files changed, 43 insertions(+), 40 deletions(-) diff --git a/config/kernel/linux-sunxi-current.config b/config/kernel/linux-sunxi-current.config index 8c93fe72f6..e7bf3bd59b 100644 --- a/config/kernel/linux-sunxi-current.config +++ b/config/kernel/linux-sunxi-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.51 Kernel Configuration +# Linux/arm 6.1.56 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -1475,8 +1475,6 @@ CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set CONFIG_NET_CLS_FLOW=y CONFIG_NET_CLS_CGROUP=y # CONFIG_NET_CLS_BPF is not set @@ -4332,10 +4330,7 @@ CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_AR0521 is not set # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set @@ -4403,9 +4398,6 @@ CONFIG_VIDEO_RJ54N1=m # CONFIG_VIDEO_CCS is not set CONFIG_VIDEO_ET8EK8=m # CONFIG_VIDEO_M5MOLS is not set -CONFIG_VIDEO_HM5065=m -CONFIG_VIDEO_GC2145=m -# end of Camera sensor devices # # Lens drivers @@ -4415,6 +4407,8 @@ CONFIG_VIDEO_AK7375=m # CONFIG_VIDEO_DW9714 is not set # CONFIG_VIDEO_DW9768 is not set CONFIG_VIDEO_DW9807_VCM=m +CONFIG_VIDEO_HM5065=m +CONFIG_VIDEO_GC2145=m # end of Lens drivers # @@ -5409,7 +5403,6 @@ CONFIG_SND_SOC_TPA6130A2=m # CONFIG_SND_SOC_LPASS_VA_MACRO is not set # CONFIG_SND_SOC_LPASS_RX_MACRO is not set # CONFIG_SND_SOC_LPASS_TX_MACRO is not set -CONFIG_SND_SOC_ACX00=m # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=y @@ -8134,7 +8127,7 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options -CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_KERNEL is not set CONFIG_DEBUG_MISC=y # @@ -8426,3 +8419,6 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config index 248b7bf1e9..c1c719f401 100644 --- a/config/kernel/linux-sunxi-edge.config +++ b/config/kernel/linux-sunxi-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.5.1 Kernel Configuration +# Linux/arm 6.5.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -2856,6 +2856,7 @@ CONFIG_WLAN_VENDOR_ZYDAS=y # CONFIG_USB_ZD1201 is not set # CONFIG_ZD1211RW is not set CONFIG_WLAN_VENDOR_QUANTENNA=y +# CONFIG_SPARD_WLAN_SUPPORT is not set CONFIG_USB_NET_RNDIS_WLAN=m CONFIG_MAC80211_HWSIM=m # CONFIG_VIRT_WIFI is not set @@ -4504,10 +4505,7 @@ CONFIG_VIDEOBUF2_DMA_SG=m # CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m CONFIG_VIDEO_HI556=m @@ -4575,9 +4573,6 @@ CONFIG_VIDEO_RJ54N1=m # CONFIG_VIDEO_ST_VGXY61 is not set CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -CONFIG_VIDEO_HM5065=m -CONFIG_VIDEO_GC2145=m -# end of Camera sensor devices # # Lens drivers @@ -4587,6 +4582,8 @@ CONFIG_VIDEO_AK7375=m # CONFIG_VIDEO_DW9714 is not set # CONFIG_VIDEO_DW9768 is not set CONFIG_VIDEO_DW9807_VCM=m +CONFIG_VIDEO_HM5065=m +CONFIG_VIDEO_GC2145=m # end of Lens drivers # @@ -5645,7 +5642,6 @@ CONFIG_SND_SOC_LPASS_WSA_MACRO=m CONFIG_SND_SOC_LPASS_VA_MACRO=m CONFIG_SND_SOC_LPASS_RX_MACRO=m CONFIG_SND_SOC_LPASS_TX_MACRO=m -CONFIG_SND_SOC_ACX00=m # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=y @@ -8494,7 +8490,7 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options -CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_KERNEL is not set CONFIG_DEBUG_MISC=y # @@ -8793,3 +8789,6 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/kernel/linux-sunxi-legacy.config b/config/kernel/linux-sunxi-legacy.config index 2d00f5314f..90f7d784c3 100644 --- a/config/kernel/linux-sunxi-legacy.config +++ b/config/kernel/linux-sunxi-legacy.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.130 Kernel Configuration +# Linux/arm 5.15.134 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -1480,8 +1480,6 @@ CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set CONFIG_NET_CLS_FLOW=y CONFIG_NET_CLS_CGROUP=y # CONFIG_NET_CLS_BPF is not set @@ -8014,7 +8012,7 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments -CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_KERNEL is not set CONFIG_DEBUG_MISC=y # @@ -8245,3 +8243,6 @@ CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage # end of Kernel hacking +# CONFIG_DEBUG_INFO_DWARF5 is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config index b2d830976a..54142e3340 100644 --- a/config/kernel/linux-sunxi64-current.config +++ b/config/kernel/linux-sunxi64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.55 Kernel Configuration +# Linux/arm64 6.1.56 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -8562,3 +8562,7 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking +# CONFIG_DEBUG_INFO_DWARF5 is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/kernel/linux-sunxi64-edge.config b/config/kernel/linux-sunxi64-edge.config index 67ca28eeba..1fe5f89e36 100644 --- a/config/kernel/linux-sunxi64-edge.config +++ b/config/kernel/linux-sunxi64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.5.5 Kernel Configuration +# Linux/arm64 6.5.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -8706,3 +8706,7 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking +# CONFIG_DEBUG_INFO_DWARF5 is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/kernel/linux-sunxi64-legacy.config b/config/kernel/linux-sunxi64-legacy.config index ee14651de5..a37d00b3f8 100644 --- a/config/kernel/linux-sunxi64-legacy.config +++ b/config/kernel/linux-sunxi64-legacy.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.130 Kernel Configuration +# Linux/arm64 5.15.134 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -1527,8 +1527,6 @@ CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m @@ -7455,10 +7453,7 @@ CONFIG_IMA_APPRAISE=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_MODSIG is not set -CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -# CONFIG_IMA_BLACKLIST_KEYRING is not set -# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y # CONFIG_IMA_DISABLE_HTABLE is not set @@ -8064,3 +8059,7 @@ CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage # end of Kernel hacking +# CONFIG_DEBUG_INFO_DWARF5 is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 21f3a64d31..b94fcbeddc 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -24,17 +24,17 @@ case $BRANCH in legacy) declare -g KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v5.15.133" + declare -g KERNELBRANCH="tag:v5.15.134" ;; current) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.1.55" + declare -g KERNELBRANCH="tag:v6.1.56" ;; edge) declare -g KERNEL_MAJOR_MINOR="6.5" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.5.5" + declare -g KERNELBRANCH="tag:v6.5.6" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index ad45a965a4..9b218cb8d8 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -25,17 +25,17 @@ case $BRANCH in legacy) declare -g KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v5.15.133" + declare -g KERNELBRANCH="tag:v5.15.134" ;; current) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.1.55" + declare -g KERNELBRANCH="tag:v6.1.56" ;; edge) declare -g KERNEL_MAJOR_MINOR="6.5" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.5.5" + declare -g KERNELBRANCH="tag:v6.5.6" ;; esac