From 12ab63f0a2b4f8f976e586f550332b1740d7bad8 Mon Sep 17 00:00:00 2001 From: hzy Date: Wed, 5 Jul 2023 13:22:36 +0800 Subject: [PATCH] meson: edge: Bump v6.4 --- config/sources/families/include/meson_common.inc | 4 ++-- .../generic-0001-m8-m8b-m8m2-Support-HDMI.patch | 4 ++-- ...c-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch | 0 ...-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch | 0 .../{meson-6.3 => meson-6.4}/odroidc1-dts-Enable-HDMI.patch | 0 .../{meson-6.3 => meson-6.4}/onecloud-0001-add-dts.patch | 0 .../onecloud-0002-dts-Support-HDMI.patch | 0 patch/kernel/meson-edge | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/generic-0001-m8-m8b-m8m2-Support-HDMI.patch (99%) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch (100%) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch (100%) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/odroidc1-dts-Enable-HDMI.patch (100%) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/onecloud-0001-add-dts.patch (100%) rename patch/kernel/archive/{meson-6.3 => meson-6.4}/onecloud-0002-dts-Support-HDMI.patch (100%) diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 02c8d4b650..94998e648e 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -54,8 +54,8 @@ case $BRANCH in edge) - declare -g KERNEL_MAJOR_MINOR="6.3" # Major and minor versions of this kernel. - KERNELBRANCH="branch:linux-6.3.y" + declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel. + KERNELBRANCH="branch:linux-6.4.y" KERNELPATCHDIR='meson-'$BRANCH ;; diff --git a/patch/kernel/archive/meson-6.3/generic-0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch similarity index 99% rename from patch/kernel/archive/meson-6.3/generic-0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch index d4a74968ff..98c89a7fd0 100644 --- a/patch/kernel/archive/meson-6.3/generic-0001-m8-m8b-m8m2-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch @@ -884,7 +884,7 @@ index 3b24a924b7b..091c670ab0e 100644 + else + preferred_bpp = 32; + -+ drm_fbdev_generic_setup(priv->drm, preferred_bpp); ++ drm_fbdev_dma_setup(priv->drm, preferred_bpp); } struct meson_drm_soc_attr { @@ -1102,7 +1102,7 @@ index 3b24a924b7b..091c670ab0e 100644 if (ret) goto uninstall_irq; -- drm_fbdev_generic_setup(drm, 32); +- drm_fbdev_dma_setup(drm, 32); + meson_fbdev_setup(priv); return 0; diff --git a/patch/kernel/archive/meson-6.3/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch b/patch/kernel/archive/meson-6.4/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch similarity index 100% rename from patch/kernel/archive/meson-6.3/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch rename to patch/kernel/archive/meson-6.4/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch diff --git a/patch/kernel/archive/meson-6.3/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-6.4/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch similarity index 100% rename from patch/kernel/archive/meson-6.3/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch rename to patch/kernel/archive/meson-6.4/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch diff --git a/patch/kernel/archive/meson-6.3/odroidc1-dts-Enable-HDMI.patch b/patch/kernel/archive/meson-6.4/odroidc1-dts-Enable-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.3/odroidc1-dts-Enable-HDMI.patch rename to patch/kernel/archive/meson-6.4/odroidc1-dts-Enable-HDMI.patch diff --git a/patch/kernel/archive/meson-6.3/onecloud-0001-add-dts.patch b/patch/kernel/archive/meson-6.4/onecloud-0001-add-dts.patch similarity index 100% rename from patch/kernel/archive/meson-6.3/onecloud-0001-add-dts.patch rename to patch/kernel/archive/meson-6.4/onecloud-0001-add-dts.patch diff --git a/patch/kernel/archive/meson-6.3/onecloud-0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.4/onecloud-0002-dts-Support-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.3/onecloud-0002-dts-Support-HDMI.patch rename to patch/kernel/archive/meson-6.4/onecloud-0002-dts-Support-HDMI.patch diff --git a/patch/kernel/meson-edge b/patch/kernel/meson-edge index 0448d6663d..f2fc4c5ad8 120000 --- a/patch/kernel/meson-edge +++ b/patch/kernel/meson-edge @@ -1 +1 @@ -archive/meson-6.3 \ No newline at end of file +archive/meson-6.4 \ No newline at end of file