linux: mainline: bump versions

radxa-repo · Sep 28, 2023 · 01a6578 · 01a6578
1 parent f08c9b6
commit 01a6578
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 162 deletions.
diff --git a/linux/latest/0001-manjaro-linux b/linux/latest/0001-manjaro-linux
diff --git a/linux/latest/0021-rockpi-4b/0014-add-possibility-of-disabling-rk808-rtc.patch b/linux/latest/0021-rockpi-4b/0014-add-possibility-of-disabling-rk808-rtc.patch
diff --git a/linux/latest/0021-rockpi-4b/0015-change-the-way-that-BUCK1-and-BUCK2-of-rk808-PMIC-se.patch b/linux/latest/0021-rockpi-4b/0015-change-the-way-that-BUCK1-and-BUCK2-of-rk808-PMIC-se.patch
diff --git a/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch b/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch
@@ -22,8 +22,8 @@ index f231280cd..3b5a15e47 100644
 +subdir-y += overlays
 +
  # SPDX-License-Identifier: GPL-2.0
+ dtb-$(CONFIG_ARCH_MESON) += amlogic-c3-c302x-aw409.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb
 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
 index 971b1f0ae..66aba816d 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
@@ -79,7 +79,7 @@ index 190d781e8..8744bb077 100644
 +
  PHONY += $(subdirs)
  $(subdirs):
- 	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
+ 	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 3fb6a99e7..a1a073d1d 100644
 --- a/scripts/Makefile.lib

diff --git a/linux/latest/0100-vendor/0003-Revert-kbuild-Disallow-DTB-overlays-to-built-from-.d.patch b/linux/latest/0100-vendor/0003-Revert-kbuild-Disallow-DTB-overlays-to-built-from-.d.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: bsp <[email protected]>
+Date: Thu, 28 Sep 2023 18:00:40 +0800
+Subject: [PATCH 1/1] Revert "kbuild: Disallow DTB overlays to built from .dts
+ named source files"
+
+This reverts commit 81d362732bac05f656cdc4bbe776ac20cfd30c45.
+---
+ scripts/Makefile.lib | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 68d0134bdbf9d..100a386fcd717 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -418,6 +418,9 @@ endif
+ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+ 	$(call if_changed_dep,dtb)
+
++$(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
++	$(call if_changed_dep,dtc)
++
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ 	$(call if_changed_dep,dtc)
+
+-- 
+2.42.0
+
diff --git a/linux/latest/fork.conf b/linux/latest/fork.conf
@@ -1,5 +1,5 @@
 BSP_GIT="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git"
-BSP_TAG="v6.4.13"
+BSP_TAG="v6.5.5"
 SUPPORTED_BOARDS=("latest"
 #"radxa-cm3-io-latest" "radxa-cm3-sodimm-io-latest" "radxa-e25-latest"
 #"radxa-zero-latest" "radxa-zero-2pro-latest"

diff --git a/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch b/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch
@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <bsp@radxa.com>
+From: ZHANG Yuntian <yt@radxa.com>
 Date: Wed, 12 Jul 2023 16:34:21 +0800
 Subject: [PATCH] Prefer FHD for meson
 
@@ -21,7 +21,7 @@ index 739e0d40cca6..d74e002bf7e8 100644
 
  struct detailed_mode_closure {
 @@ -233,6 +235,12 @@ static const struct edid_quirk {
- 	EDID_QUIRK('S', 'V', 'R', 0x1019, EDID_QUIRK_NON_DESKTOP),
+ 	EDID_QUIRK('A', 'U', 'O', 0x1111, EDID_QUIRK_NON_DESKTOP),
  };
 
 +static const struct connector_quirk {

diff --git a/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch b/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch
@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <bsp@radxa.com>
+From: ZHANG Yuntian <yt@radxa.com>
 Date: Wed, 27 Sep 2023 19:15:30 +0800
 Subject: [PATCH 1/1] Rename ZERO 2
 

diff --git a/linux/stable/fork.conf b/linux/stable/fork.conf
@@ -1,5 +1,5 @@
 BSP_GIT="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git"
-BSP_TAG="v6.1.54"
+BSP_TAG="v6.1.55"
 SUPPORTED_BOARDS=("stable"
 "radxa-zero" "radxa-zero-2pro"
 #"radxa-cm3-io-stable" "radxa-cm3-sodimm-io-stable" "radxa-e25-stable"