From f2a61e98889f76e657a9739496e16f42e4ca0040 Mon Sep 17 00:00:00 2001 From: hzyitc Date: Wed, 12 Oct 2022 17:22:14 +0800 Subject: [PATCH] meson: edge: bump v5.19 (#4272) * meson: edge: Bump v5.19 * meson: edge: refresh patches * meson: edge: refresh config --- config/kernel/linux-meson-edge.config | 124 ++++++++++++------ .../sources/families/include/meson_common.inc | 2 +- .../0001-m8-m8b-m8m2-Support-HDMI.patch | 40 +++--- ...m2-drm-forcefully-enable-XRGB-format.patch | 4 +- ...-clock-speed-before-sending-HS-CMD13.patch | 13 +- .../board_odroidc1/dts-Enable-HDMI.patch | 0 .../board_onecloud/0001-add-dts.patch | 6 +- .../0002-dts-Support-HDMI.patch | 12 +- .../usb-disable-ACA-check.patch | 6 +- .../generate-uImage-instand-of-zImage.patch | 0 patch/kernel/meson-edge | 2 +- 11 files changed, 128 insertions(+), 81 deletions(-) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/0001-m8-m8b-m8m2-Support-HDMI.patch (99%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch (92%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch (86%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/board_odroidc1/dts-Enable-HDMI.patch (100%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/board_onecloud/0001-add-dts.patch (98%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/board_onecloud/0002-dts-Support-HDMI.patch (90%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/board_onecloud/usb-disable-ACA-check.patch (88%) rename patch/kernel/archive/{meson-5.18 => meson-5.19}/generate-uImage-instand-of-zImage.patch (100%) diff --git a/config/kernel/linux-meson-edge.config b/config/kernel/linux-meson-edge.config index 5e2163c7b1..96649cff3a 100644 --- a/config/kernel/linux-meson-edge.config +++ b/config/kernel/linux-meson-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.18.19 Kernel Configuration +# Linux/arm 5.19.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -42,7 +42,6 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y @@ -203,6 +202,7 @@ CONFIG_RD_LZO=y CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y # CONFIG_BOOT_CONFIG is not set +CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_LD_ORPHAN_WARN=y @@ -233,7 +233,6 @@ CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_BASE_RELATIVE=y -# CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y CONFIG_RSEQ=y @@ -250,17 +249,6 @@ CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set # end of Kernel Performance Events And Counters -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -CONFIG_COMPAT_BRK=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_SLAB_MERGE_DEFAULT=y -# CONFIG_SLAB_FREELIST_RANDOM is not set -# CONFIG_SLAB_FREELIST_HARDENED is not set -# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set -CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y @@ -288,16 +276,9 @@ CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_OMAP1 is not set # # Multiple platform selection @@ -321,9 +302,11 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_BCM is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_DIGICOLOR is not set +# CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_HPE is not set # CONFIG_ARCH_MXC is not set # CONFIG_ARCH_KEYSTONE is not set # CONFIG_ARCH_MEDIATEK is not set @@ -350,7 +333,6 @@ CONFIG_MACH_MESON8=y # CONFIG_ARCH_QCOM is not set # CONFIG_ARCH_RDA is not set # CONFIG_ARCH_REALTEK is not set -# CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_RENESAS is not set @@ -362,6 +344,7 @@ CONFIG_MACH_MESON8=y # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_UNIPHIER is not set # CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_WM8850 is not set # CONFIG_ARCH_ZYNQ is not set @@ -391,6 +374,8 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_VIRT_EXT=y CONFIG_SWP_EMULATE=y +CONFIG_CPU_LITTLE_ENDIAN=y +# CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -419,6 +404,7 @@ CONFIG_DEBUG_ALIGN_RODATA=y # CONFIG_ARM_ERRATA_754322 is not set # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set +# CONFIG_ARM_ERRATA_764319 is not set # CONFIG_ARM_ERRATA_775420 is not set # CONFIG_ARM_ERRATA_798181 is not set # CONFIG_ARM_ERRATA_773022 is not set @@ -710,7 +696,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y # end of General architecture-dependent options @@ -721,6 +706,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_MODULE_SIG=y @@ -831,6 +817,26 @@ CONFIG_COREDUMP=y # # Memory Management options # +CONFIG_SWAP=y +# CONFIG_ZSWAP is not set +CONFIG_ZSMALLOC=m +# CONFIG_ZSMALLOC_STAT is not set + +# +# SLAB allocator options +# +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_FREELIST_RANDOM is not set +# CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SLUB_STATS is not set +CONFIG_SLUB_CPU_PARTIAL=y +# end of SLAB allocator options + +# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set +CONFIG_COMPAT_BRK=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set @@ -851,20 +857,16 @@ CONFIG_CMA=y # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_SYSFS is not set CONFIG_CMA_AREAS=7 -# CONFIG_ZSWAP is not set -CONFIG_ZPOOL=m -CONFIG_ZBUD=m -CONFIG_Z3FOLD=m -CONFIG_ZSMALLOC=m -# CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y +CONFIG_VM_EVENT_COUNTERS=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_TEST is not set CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y # CONFIG_ANON_VMA_NAME is not set +# CONFIG_USERFAULTFD is not set # # Data Access Monitoring @@ -1818,11 +1820,15 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER=y CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_FW_LOADER_SYSFS=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_LOADER_COMPRESS_XZ=y +# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set CONFIG_FW_CACHE=y +# CONFIG_FW_UPLOAD is not set # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -1851,6 +1857,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # CONFIG_MOXTET is not set CONFIG_VEXPRESS_CONFIG=y # CONFIG_MHI_BUS is not set +# CONFIG_MHI_BUS_EP is not set # end of Bus devices CONFIG_CONNECTOR=m @@ -1877,7 +1884,6 @@ CONFIG_ARM_SCMI_POWER_DOMAIN=m CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set # CONFIG_FW_CFG_SYSFS is not set -CONFIG_SYSFB=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_TRUSTED_FOUNDATIONS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -1898,9 +1904,10 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set +# CONFIG_EFI_COCO_SECRET is not set # end of EFI (Extensible Firmware Interface) Support -# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set CONFIG_HAVE_ARM_SMCCC=y @@ -2095,7 +2102,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_MPT2SAS is not set # CONFIG_SCSI_MPI3MR is not set # CONFIG_SCSI_SMARTPQI is not set -# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_MYRB is not set # CONFIG_SCSI_MYRS is not set @@ -2422,6 +2428,7 @@ CONFIG_FIXED_PHY=y # CONFIG_AMD_PHY is not set # CONFIG_MESON_GXL_PHY is not set # CONFIG_ADIN_PHY is not set +# CONFIG_ADIN1100_PHY is not set # CONFIG_AQUANTIA_PHY is not set CONFIG_AX88796B_PHY=m # CONFIG_BROADCOM_PHY is not set @@ -2462,6 +2469,7 @@ CONFIG_SMSC_PHY=m # CONFIG_DP83848_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83869_PHY is not set +# CONFIG_DP83TD510_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set # CONFIG_MICREL_KS8995MA is not set @@ -2609,6 +2617,8 @@ CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m # CONFIG_WILC1000_SPI is not set # CONFIG_WILC1000_HW_OOB_INTR is not set +CONFIG_WLAN_VENDOR_PURELIFI=y +# CONFIG_PLFXLC is not set CONFIG_WLAN_VENDOR_RALINK=y CONFIG_RT2X00=m # CONFIG_RT2400PCI is not set @@ -2655,6 +2665,8 @@ CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set # CONFIG_WLAN_VENDOR_RSI is not set +CONFIG_WLAN_VENDOR_SILABS=y +# CONFIG_WFX is not set # CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set CONFIG_WLAN_VENDOR_ZYDAS=y @@ -3291,6 +3303,7 @@ CONFIG_SENSORS_IIO_HWMON=y # CONFIG_SENSORS_NTC_THERMISTOR is not set # CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set +# CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set @@ -3589,6 +3602,7 @@ CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set # CONFIG_REGULATOR_RT4801 is not set # CONFIG_REGULATOR_RT5190A is not set +# CONFIG_REGULATOR_RT5759 is not set # CONFIG_REGULATOR_RT6160 is not set # CONFIG_REGULATOR_RT6245 is not set # CONFIG_REGULATOR_RTQ2134 is not set @@ -4467,7 +4481,6 @@ CONFIG_DVB_SP2=m # # CONFIG_IMX_IPUV3_CORE is not set CONFIG_DRM=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DEBUG_MM is not set # CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_KMS_HELPER=y @@ -4477,6 +4490,9 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_DISPLAY_HELPER=y +CONFIG_DRM_DISPLAY_HDMI_HELPER=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y @@ -4534,6 +4550,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +# CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set @@ -4564,6 +4581,7 @@ CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_DISPLAY_CONNECTOR=y # CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_LONTIUM_LT8912B is not set +# CONFIG_DRM_LONTIUM_LT9211 is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set # CONFIG_DRM_ITE_IT66121 is not set @@ -4595,6 +4613,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=y CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set +# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set # CONFIG_DRM_DW_HDMI_CEC is not set # end of Display Interface Bridges @@ -4756,6 +4775,7 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_ALOOP is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_SERIAL_GENERIC is not set # CONFIG_SND_MPU401 is not set # CONFIG_SND_PCI is not set @@ -4876,6 +4896,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_CS35L36 is not set # CONFIG_SND_SOC_CS35L41_SPI is not set # CONFIG_SND_SOC_CS35L41_I2C is not set +# CONFIG_SND_SOC_CS35L45_SPI is not set +# CONFIG_SND_SOC_CS35L45_I2C is not set # CONFIG_SND_SOC_CS42L42 is not set # CONFIG_SND_SOC_CS42L51_I2C is not set # CONFIG_SND_SOC_CS42L52 is not set @@ -4911,6 +4933,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX98520 is not set # CONFIG_SND_SOC_MAX98373_I2C is not set # CONFIG_SND_SOC_MAX98390 is not set +# CONFIG_SND_SOC_MAX98396 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set # CONFIG_SND_SOC_PCM1681 is not set @@ -4975,7 +4998,8 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8731_I2C is not set +# CONFIG_SND_SOC_WM8731_SPI is not set # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -4987,6 +5011,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8940 is not set # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -5080,6 +5105,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MALTRON is not set # CONFIG_HID_MAYFLASH is not set +# CONFIG_HID_MEGAWORLD_FF is not set # CONFIG_HID_REDRAGON is not set # CONFIG_HID_MICROSOFT is not set # CONFIG_HID_MONTEREY is not set @@ -5483,6 +5509,7 @@ CONFIG_MMC_CQHCI=y CONFIG_MMC_HSQ=m # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set +# CONFIG_SCSI_UFSHCD is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -5537,6 +5564,10 @@ CONFIG_LEDS_PWM=y # Flash and Torch LED drivers # +# +# RGB LED drivers +# + # # LED Triggers # @@ -5732,6 +5763,7 @@ CONFIG_SYNC_FILE=y # CONFIG_UIO is not set # CONFIG_VFIO is not set # CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VDPA is not set @@ -6446,6 +6478,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_MESON=y # CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_XILINX is not set # # IRQ chip support @@ -6454,6 +6487,7 @@ CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_AL_FIC is not set +# CONFIG_XILINX_INTC is not set CONFIG_MESON_IRQ_GPIO=y # end of IRQ chip support @@ -6560,6 +6594,7 @@ CONFIG_COUNTER=m # CONFIG_INTEL_QEP is not set # CONFIG_MOST is not set # CONFIG_PECI is not set +# CONFIG_HTE is not set # end of Device Drivers # @@ -6676,6 +6711,7 @@ CONFIG_FSCACHE_STATS=y CONFIG_CACHEFILES=y # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_ERROR_INJECTION is not set +# CONFIG_CACHEFILES_ONDEMAND is not set # end of Caches # @@ -6932,6 +6968,7 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_TRUSTED_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_KEY_NOTIFICATIONS is not set @@ -6959,6 +6996,10 @@ CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization + +CONFIG_RANDSTRUCT_NONE=y +# CONFIG_RANDSTRUCT_FULL is not set +# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -7071,6 +7112,7 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m +# CONFIG_CRYPTO_SM3_GENERIC is not set CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_WP512=m @@ -7093,7 +7135,7 @@ CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SM4=m +# CONFIG_CRYPTO_SM4_GENERIC is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m @@ -7135,6 +7177,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y +# CONFIG_FIPS_SIGNATURE_SELFTEST is not set # # Certificates for signature checking @@ -7150,6 +7193,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_REVOCATION_LIST is not set +# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set # end of Certificates for signature checking CONFIG_BINARY_PRINTF=y @@ -7191,8 +7235,6 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_LIB_SM3=m -CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines CONFIG_LIB_MEMNEQ=y @@ -7296,6 +7338,8 @@ CONFIG_FONT_SUPPORT=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_SG_POOL=y +CONFIG_STACKDEPOT=y +CONFIG_STACK_HASH_ORDER=20 CONFIG_SBITMAP=y # end of Library routines @@ -7362,6 +7406,7 @@ CONFIG_HAVE_ARCH_KGDB=y # # CONFIG_NET_DEV_REFCNT_TRACKER is not set # CONFIG_NET_NS_REFCNT_TRACKER is not set +# CONFIG_DEBUG_NET is not set # end of Networking Debugging # @@ -7369,14 +7414,14 @@ CONFIG_HAVE_ARCH_KGDB=y # # CONFIG_PAGE_EXTENSION is not set # CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -7463,6 +7508,7 @@ CONFIG_STACKTRACE=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_REF_SCALE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=21 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 CONFIG_RCU_TRACE=y # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 64510114f9..26e3532f79 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -43,7 +43,7 @@ case $BRANCH in edge) - KERNELBRANCH="branch:linux-5.18.y" + KERNELBRANCH="branch:linux-5.19.y" KERNELPATCHDIR='meson-'$BRANCH ;; diff --git a/patch/kernel/archive/meson-5.18/0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch similarity index 99% rename from patch/kernel/archive/meson-5.18/0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch index 69eaba7fc5..f5f8ff5459 100644 --- a/patch/kernel/archive/meson-5.18/0001-m8-m8b-m8m2-Support-HDMI.patch +++ b/patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch @@ -710,7 +710,7 @@ index 3afa31bdc950..817a5270aee6 100644 obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_TRANSWITCH_HDMI) += meson_transwitch_hdmi.o diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c -index edae79f41153..e1e5a84fd453 100644 +index bd4ca11d3ff5..bd5bdbdfe662 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -12,6 +12,7 @@ @@ -721,7 +721,7 @@ index edae79f41153..e1e5a84fd453 100644 #include #include -@@ -129,30 +130,147 @@ static struct regmap_config meson_regmap_config = { +@@ -132,30 +133,147 @@ static struct regmap_config meson_regmap_config = { .max_register = 0x1000, }; @@ -888,7 +888,7 @@ index edae79f41153..e1e5a84fd453 100644 } struct meson_drm_soc_attr { -@@ -161,13 +279,29 @@ struct meson_drm_soc_attr { +@@ -164,13 +282,29 @@ struct meson_drm_soc_attr { }; static const struct meson_drm_soc_attr meson_drm_soc_attrs[] = { @@ -916,10 +916,10 @@ index edae79f41153..e1e5a84fd453 100644 .attrs = (const struct soc_device_attribute []) { { .soc_id = "GXL (S805*)", }, + { .soc_id = "Meson8b (S805)", }, - { /* sentinel */ }, + { /* sentinel */ } } }, -@@ -208,67 +342,123 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -211,67 +345,123 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->compat = match->compat; priv->afbcd.ops = match->afbcd_ops; @@ -1066,7 +1066,7 @@ index edae79f41153..e1e5a84fd453 100644 /* Assign limits per soc revision/package */ for (i = 0 ; i < ARRAY_SIZE(meson_drm_soc_attrs) ; ++i) { -@@ -284,11 +474,11 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -287,11 +477,11 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) */ ret = drm_aperture_remove_framebuffers(false, &meson_driver); if (ret) @@ -1080,7 +1080,7 @@ index edae79f41153..e1e5a84fd453 100644 drm->mode_config.max_width = 3840; drm->mode_config.max_height = 2160; drm->mode_config.funcs = &meson_mode_config_funcs; -@@ -303,7 +493,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -306,7 +496,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) if (priv->afbcd.ops) { ret = priv->afbcd.ops->init(priv); if (ret) @@ -1089,7 +1089,7 @@ index edae79f41153..e1e5a84fd453 100644 } /* Encoder Initialization */ -@@ -316,7 +506,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -319,7 +509,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ret = component_bind_all(drm->dev, drm); if (ret) { dev_err(drm->dev, "Couldn't bind all components\n"); @@ -1098,7 +1098,7 @@ index edae79f41153..e1e5a84fd453 100644 } } -@@ -350,7 +540,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -353,7 +543,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) if (ret) goto uninstall_irq; @@ -1107,7 +1107,7 @@ index edae79f41153..e1e5a84fd453 100644 return 0; -@@ -359,6 +549,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) +@@ -362,6 +552,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) exit_afbcd: if (priv->afbcd.ops) priv->afbcd.ops->exit(priv); @@ -1118,7 +1118,7 @@ index edae79f41153..e1e5a84fd453 100644 free_drm: drm_dev_put(drm); -@@ -391,6 +585,10 @@ static void meson_drv_unbind(struct device *dev) +@@ -394,6 +588,10 @@ static void meson_drv_unbind(struct device *dev) if (priv->afbcd.ops) priv->afbcd.ops->exit(priv); @@ -1129,7 +1129,7 @@ index edae79f41153..e1e5a84fd453 100644 } static const struct component_master_ops meson_drv_master_ops = { -@@ -405,6 +603,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev) +@@ -408,6 +606,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev) if (!priv) return 0; @@ -1138,7 +1138,7 @@ index edae79f41153..e1e5a84fd453 100644 return drm_mode_config_helper_suspend(priv->drm); } -@@ -415,6 +615,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) +@@ -418,6 +618,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) if (!priv) return 0; @@ -1146,7 +1146,7 @@ index edae79f41153..e1e5a84fd453 100644 meson_vpu_init(priv); meson_venc_init(priv); meson_vpp_init(priv); -@@ -490,6 +691,18 @@ static int meson_drv_probe(struct platform_device *pdev) +@@ -493,6 +694,18 @@ static int meson_drv_probe(struct platform_device *pdev) return 0; }; @@ -1165,7 +1165,7 @@ index edae79f41153..e1e5a84fd453 100644 static struct meson_drm_match_data meson_drm_gxbb_data = { .compat = VPU_COMPATIBLE_GXBB, }; -@@ -509,6 +722,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = { +@@ -512,6 +725,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = { }; static const struct of_device_id dt_match[] = { @@ -1504,7 +1504,7 @@ index a7692584487c..ef3f73b0ccf8 100644 pdev = of_find_device_by_node(remote); of_node_put(remote); diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 8640a8a8a469..6c820230f473 100644 +index 44aa52629443..bd0052897b96 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -199,8 +199,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, @@ -1576,7 +1576,7 @@ index 8640a8a8a469..6c820230f473 100644 diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.c b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c new file mode 100644 -index 000000000000..85f82c0a0494 +index 000000000000..e88bdba7c16f --- /dev/null +++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c @@ -0,0 +1,1579 @@ @@ -1599,11 +1599,11 @@ index 000000000000..85f82c0a0494 +#include +#include + ++#include +#include +#include +#include +#include -+#include +#include +#include + @@ -3955,7 +3955,7 @@ index 3c55ed003359..009882bda7b9 100644 /* Disable HDMI */ writel_bits_relaxed(VPU_HDMI_ENCI_DATA_TO_HDMI | diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c -index 259f3e6bec90..3c2b99e75082 100644 +index d4b907889a21..836dac22c8e1 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -436,10 +436,22 @@ void meson_viu_init(struct meson_drm *priv) @@ -4425,5 +4425,5 @@ index 000000000000..96549e63bc1e +MODULE_DESCRIPTION("Amlogic Meson CVBS DAC driver"); +MODULE_LICENSE("GPL v2"); -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch b/patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch similarity index 92% rename from patch/kernel/archive/meson-5.18/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch rename to patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch index 6a27acf544..65c463898d 100644 --- a/patch/kernel/archive/meson-5.18/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch +++ b/patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch @@ -5,7 +5,7 @@ meson8/meson8b/meson8m2: drm: Forcefully enable XRGB format 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 6c820230f47..16a2c18e717 100644 +index bd0052897b96..e45e408fc837 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -482,6 +482,8 @@ static const struct drm_plane_funcs meson_plane_funcs = { @@ -18,5 +18,5 @@ index 6c820230f47..16a2c18e717 100644 DRM_FORMAT_RGB565, }; -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-5.19/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch similarity index 86% rename from patch/kernel/archive/meson-5.18/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch rename to patch/kernel/archive/meson-5.19/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch index 2cde1c3345..888e4db156 100644 --- a/patch/kernel/archive/meson-5.18/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch +++ b/patch/kernel/archive/meson-5.19/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch @@ -1,15 +1,16 @@ Revert "mmc: core: Set HS clock speed before sending HS CMD13" This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0. + --- drivers/mmc/core/mmc.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index efa95dc4fc4..e7ea45386c2 100644 +index 89cd48fcec79..a776ac641541 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c -@@ -1384,17 +1384,13 @@ static int mmc_select_hs400es(struct mmc_card *card) +@@ -1391,17 +1391,13 @@ static int mmc_select_hs400es(struct mmc_card *card) goto out_err; } @@ -29,7 +30,7 @@ index efa95dc4fc4..e7ea45386c2 100644 /* Switch card to DDR with strobe bit */ val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE; err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, -@@ -1452,7 +1448,7 @@ static int mmc_select_hs400es(struct mmc_card *card) +@@ -1459,7 +1455,7 @@ static int mmc_select_hs400es(struct mmc_card *card) static int mmc_select_hs200(struct mmc_card *card) { struct mmc_host *host = card->host; @@ -38,7 +39,7 @@ index efa95dc4fc4..e7ea45386c2 100644 int err = -EINVAL; u8 val; -@@ -1483,17 +1479,8 @@ static int mmc_select_hs200(struct mmc_card *card) +@@ -1490,17 +1486,8 @@ static int mmc_select_hs200(struct mmc_card *card) false, true, MMC_CMD_RETRIES); if (err) goto err; @@ -56,7 +57,7 @@ index efa95dc4fc4..e7ea45386c2 100644 /* * For HS200, CRC errors are not a reliable way to know the -@@ -1506,10 +1493,8 @@ static int mmc_select_hs200(struct mmc_card *card) +@@ -1513,10 +1500,8 @@ static int mmc_select_hs200(struct mmc_card *card) * mmc_select_timing() assumes timing has not changed if * it is a switch error. */ @@ -69,5 +70,5 @@ index efa95dc4fc4..e7ea45386c2 100644 err: if (err) { -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/board_odroidc1/dts-Enable-HDMI.patch b/patch/kernel/archive/meson-5.19/board_odroidc1/dts-Enable-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-5.18/board_odroidc1/dts-Enable-HDMI.patch rename to patch/kernel/archive/meson-5.19/board_odroidc1/dts-Enable-HDMI.patch diff --git a/patch/kernel/archive/meson-5.18/board_onecloud/0001-add-dts.patch b/patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch similarity index 98% rename from patch/kernel/archive/meson-5.18/board_onecloud/0001-add-dts.patch rename to patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch index 1337d5089b..f172a56f30 100644 --- a/patch/kernel/archive/meson-5.18/board_onecloud/0001-add-dts.patch +++ b/patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch @@ -7,10 +7,10 @@ Add dts create mode 100644 arch/arm/boot/dts/meson8b-onecloud.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 13d788d1e6dc..d18213e31052 100644 +index 27eec8e670ec..0f2cd33eeb72 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -386,6 +386,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ +@@ -392,6 +392,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ meson8b-ec100.dtb \ meson8b-mxq.dtb \ meson8b-odroidc1.dtb \ @@ -427,5 +427,5 @@ index 000000000000..d517e45e22ba + pinctrl-names = "default"; +}; -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/board_onecloud/0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-5.19/board_onecloud/0002-dts-Support-HDMI.patch similarity index 90% rename from patch/kernel/archive/meson-5.18/board_onecloud/0002-dts-Support-HDMI.patch rename to patch/kernel/archive/meson-5.19/board_onecloud/0002-dts-Support-HDMI.patch index b901f6dd5a..8bf41e5d13 100644 --- a/patch/kernel/archive/meson-5.18/board_onecloud/0002-dts-Support-HDMI.patch +++ b/patch/kernel/archive/meson-5.19/board_onecloud/0002-dts-Support-HDMI.patch @@ -5,7 +5,7 @@ dts: Support HDMI 1 file changed, 58 insertions(+) diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts -index 050b2e65348..69fff33c496 100644 +index d517e45e22ba..89e3e3238dec 100644 --- a/arch/arm/boot/dts/meson8b-onecloud.dts +++ b/arch/arm/boot/dts/meson8b-onecloud.dts @@ -32,6 +32,48 @@ emmc_pwrseq: emmc-pwrseq { @@ -57,8 +57,8 @@ index 050b2e65348..69fff33c496 100644 button { // compatible = "gpio-keys-polled"; // poll-interval = <100>; -@@ -142,6 +184,10 @@ vcc_core: regulator-vcc-core { - }; +@@ -178,6 +220,10 @@ &pwm_cd { + clock-names = "clkin0", "clkin1"; }; +&aiu { @@ -68,8 +68,8 @@ index 050b2e65348..69fff33c496 100644 &cpu0 { cpu-supply = <&vcc_core>; }; -@@ -150,6 +196,18 @@ &mali { - mali-supply = <&vcc_core>; +@@ -187,6 +233,18 @@ &mali { + // mali-supply = <&vcc_core>; }; +&hdmi_tx { @@ -88,5 +88,5 @@ index 050b2e65348..69fff33c496 100644 gpio-line-names = // 0-3 Bank GPIOX 0-3 -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/board_onecloud/usb-disable-ACA-check.patch b/patch/kernel/archive/meson-5.19/board_onecloud/usb-disable-ACA-check.patch similarity index 88% rename from patch/kernel/archive/meson-5.18/board_onecloud/usb-disable-ACA-check.patch rename to patch/kernel/archive/meson-5.19/board_onecloud/usb-disable-ACA-check.patch index f93846a861..f2f6111a3e 100644 --- a/patch/kernel/archive/meson-5.18/board_onecloud/usb-disable-ACA-check.patch +++ b/patch/kernel/archive/meson-5.19/board_onecloud/usb-disable-ACA-check.patch @@ -9,10 +9,10 @@ So just disable this check. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c -index 56b526b7185..b69bacc20b4 100644 +index dd96763911b8..dff1bc44f1ca 100644 --- a/drivers/phy/amlogic/phy-meson8b-usb2.c +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c -@@ -199,13 +199,13 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) +@@ -197,13 +197,13 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) udelay(ACA_ENABLE_COMPLETE_TIME); regmap_read(priv->regmap, REG_ADP_BC, ®); @@ -29,5 +29,5 @@ index 56b526b7185..b69bacc20b4 100644 } -- -2.25.1 +2.34.1 diff --git a/patch/kernel/archive/meson-5.18/generate-uImage-instand-of-zImage.patch b/patch/kernel/archive/meson-5.19/generate-uImage-instand-of-zImage.patch similarity index 100% rename from patch/kernel/archive/meson-5.18/generate-uImage-instand-of-zImage.patch rename to patch/kernel/archive/meson-5.19/generate-uImage-instand-of-zImage.patch diff --git a/patch/kernel/meson-edge b/patch/kernel/meson-edge index c14b96a21f..c5abf4c09b 120000 --- a/patch/kernel/meson-edge +++ b/patch/kernel/meson-edge @@ -1 +1 @@ -archive/meson-5.18 \ No newline at end of file +archive/meson-5.19 \ No newline at end of file