From 4752a90850cc892ae1391da2db63c152ed4d5f74 Mon Sep 17 00:00:00 2001 From: Gunjan Gupta Date: Tue, 4 Jul 2023 00:40:53 +0530 Subject: [PATCH] allwinner: Bump u-boot and kernel versions U-boot 2023.07-rc4 -> 2023.07-rc6 Kernel Legacy 5.15.113 -> 5.15.119 Kernel Current 6.1.34 -> 6.1.37 Kernel Edge 6.4.0 -> 6.4.1 --- config/kernel/linux-sunxi-current.config | 21 ++++++++++--------- .../families/include/sunxi64_common.inc | 8 +++---- .../sources/families/include/sunxi_common.inc | 8 +++---- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/config/kernel/linux-sunxi-current.config b/config/kernel/linux-sunxi-current.config index cc4e7241a8..ed89c83201 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.30 Kernel Configuration +# Linux/arm 6.1.37 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0" CONFIG_CC_IS_GCC=y @@ -830,6 +830,7 @@ CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set # CONFIG_LRU_GEN is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y # # Data Access Monitoring @@ -3955,7 +3956,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_USB_RAINSHADOW_CEC is not set # end of CEC support -CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_SUPPORT=m # CONFIG_MEDIA_SUPPORT_FILTER is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set @@ -3974,9 +3975,9 @@ CONFIG_MEDIA_TEST_SUPPORT=y # # Media core support # -CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_DEV=m CONFIG_MEDIA_CONTROLLER=y -CONFIG_DVB_CORE=y +CONFIG_DVB_CORE=m # end of Media core support # @@ -4110,7 +4111,7 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_DVB_AS102=m CONFIG_DVB_B2C2_FLEXCOP_USB=m # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_USB_V2=y +CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m CONFIG_DVB_USB_ANYSEE=m @@ -4169,7 +4170,7 @@ CONFIG_VIDEO_EM28XX_RC=m CONFIG_USB_AIRSPY=m CONFIG_USB_HACKRF=m CONFIG_USB_MSI2500=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m @@ -4183,7 +4184,7 @@ CONFIG_USB_KEENE=m CONFIG_USB_MA901=m CONFIG_USB_MR800=m CONFIG_USB_RAREMONO=m -CONFIG_RADIO_SI470X=y +CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m CONFIG_USB_SI4713=m @@ -4531,7 +4532,7 @@ CONFIG_CXD2880_SPI_DRV=m # CONFIG_VIDEO_GS1662 is not set # end of Media SPI Adapters -CONFIG_MEDIA_TUNER=y +CONFIG_MEDIA_TUNER=m # # Customize TV tuners @@ -6356,6 +6357,7 @@ CONFIG_FB_TFT_SSD1331=m CONFIG_FB_TFT_SSD1351=m CONFIG_FB_TFT_ST7735R=m CONFIG_FB_TFT_ST7789V=m +# CONFIG_FB_TFT_ST7796S is not set CONFIG_FB_TFT_TINYLCD=m CONFIG_FB_TFT_TLS8204=m CONFIG_FB_TFT_UC1611=m @@ -7544,7 +7546,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y # CONFIG_SMB_SERVER is not set -CONFIG_SMBFS_COMMON=m +CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set @@ -8416,4 +8418,3 @@ CONFIG_ARCH_USE_MEMTEST=y # # end of Rust hacking # end of Kernel hacking -# CONFIG_DEBUG_INFO is not set diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 1e28bb3812..4e6f66cf2e 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -12,7 +12,7 @@ declare -g ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl declare -g ATFBRANCH="tag:v2.9.0" declare -g BOOTDELAY=1 declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}" -declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.07-rc4"}" +declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.07-rc6"}" declare -g BOOTENV_FILE='sunxi.txt' UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}" declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd' @@ -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.113" + declare -g KERNELBRANCH="tag:v5.15.119" ;; current) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.1.34" + declare -g KERNELBRANCH="tag:v6.1.37" ;; edge) declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.4" + declare -g KERNELBRANCH="tag:v6.4.1" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index e5e4f92077..e0a9f8ba3e 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -10,7 +10,7 @@ enable_extension "sunxi-tools" declare -g ARCH=armhf declare -g BOOTDELAY=1 declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}" -declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.07-rc4"}" +declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.07-rc6"}" UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-;;u-boot-sunxi-with-spl.bin}" declare -g BOOTSCRIPT="boot-sunxi.cmd:boot.cmd" declare -g BOOTENV_FILE='sunxi.txt' @@ -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.113" + declare -g KERNELBRANCH="tag:v5.15.119" ;; current) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.1.34" + declare -g KERNELBRANCH="tag:v6.1.37" ;; edge) declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.4" + declare -g KERNELBRANCH="tag:v6.4.1" ;; esac