git » linux-armlfs-lts61.git » commit 5aaab43

linux-armlfs-lts61 6.1.102

author Urja (ARMLFS builder)
2024-07-30 08:45:04 UTC
committer Urja (ARMLFS builder)
2024-07-30 08:45:04 UTC
parent 0c96ffcffe95182b4dbcae8b1d5faff8eba65d15

linux-armlfs-lts61 6.1.102

PKGBUILD +5 -5
armlfs.patch +39 -39
kernel.its +91 -7

diff --git a/PKGBUILD b/PKGBUILD
index 4a62c19..a2cdaaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgbase=linux-armlfs${_xname}
 _srcname=linux-6.1
 _kernelname=${pkgbase#linux}
 _desc="Veyron Speedy"
-pkgver=6.1.101
+pkgver=6.1.102
 pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -170,10 +170,10 @@ for _p in ${pkgname[@]}; do
 done
 
 sha256sums=('2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb'
-            '5b507995a75c992e3dccafc826a359a892ab4f98af8e82a870e767594f2e6f6d'
-            'e9e4318f278bc4c72cb4d222cc646666c4660d60471e5b7adb65346ca1d17627'
-            '017e419a9c82fd0921b1bd48610feb0edd15f9545256a5d3ea7d32f9bb80094f'
+            '2761965eeeb54dce4ac118d74cee239ef5141efe369094d6e8e51891472f827d'
+            'b1d3e59ed6df31ce26bc95723a3c4e1d534f0edca93b7c99b27def9f09c3a886'
+            '307b66929260454f922bd3f2543e19f87667d2232fe368a4fece9ee86bc124fa'
             '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb'
             'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            'SKIP')
+            '88e1964eaa0eb6f728f8c9f4d402762460c6e5ab3117017893deb181429f1322')
diff --git a/armlfs.patch b/armlfs.patch
index f0972c7..f8f0d5a 100644
--- a/armlfs.patch
+++ b/armlfs.patch
@@ -1,4 +1,4 @@
-From 02af8b21126fa8345eef77387a3f156accacc613 Mon Sep 17 00:00:00 2001
+From c89e8429c24c3c4eefee6591fc2aaa29a4f24fc4 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Mon, 27 Aug 2018 10:30:55 +0000
 Subject: [PATCH 01/15] drivers: clk-rk3288: support for dedicating NPLL to a
@@ -13,7 +13,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  2 files changed, 60 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index baa5aebd327..11493f0be2b 100644
+index baa5aebd3277..11493f0be2b1 100644
 --- a/drivers/clk/rockchip/clk-rk3288.c
 +++ b/drivers/clk/rockchip/clk-rk3288.c
 @@ -195,10 +195,14 @@ PNAME(mux_ddrphy_p)		= { "dpll_ddr", "gpll_ddr" };
@@ -149,7 +149,7 @@ index baa5aebd327..11493f0be2b 100644
  	if (IS_ERR(ctx)) {
  		pr_err("%s: rockchip clk init failed\n", __func__);
 diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
-index ee01739e4a7..45079f1376e 100644
+index ee01739e4a7c..45079f1376e9 100644
 --- a/drivers/clk/rockchip/clk.h
 +++ b/drivers/clk/rockchip/clk.h
 @@ -442,6 +442,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name,
@@ -166,7 +166,7 @@ index ee01739e4a7..45079f1376e 100644
 2.44.0
 
 
-From a4d3c9db9cd61b35e298bd7d9c5d04f601a170bb Mon Sep 17 00:00:00 2001
+From 3a5d22da5e05215ed9be70baeb34f080b20283b4 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Wed, 22 Aug 2018 18:36:40 +0000
 Subject: [PATCH 02/15] drm: dw_hdmi-rockchip: better clock selection logic and
@@ -199,7 +199,7 @@ Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
  1 file changed, 174 insertions(+), 97 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index ae857bf8bd6..e20fb15fc8a 100644
+index ae857bf8bd62..e20fb15fc8aa 100644
 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
 +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
 @@ -80,8 +80,13 @@ struct rockchip_hdmi {
@@ -605,7 +605,7 @@ index ae857bf8bd6..e20fb15fc8a 100644
 2.44.0
 
 
-From f5fff76625e86d9fe6f4fa3656c8a0d3cb3d1c06 Mon Sep 17 00:00:00 2001
+From 216a4e0bbf4d277438afeeedbf8df26590865134 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Mon, 27 Aug 2018 19:00:50 +0000
 Subject: [PATCH 03/15] dts: rk3288: support for dedicating npll to a vop
@@ -620,7 +620,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 511ca864c1b..0a18ba9c394 100644
+index 511ca864c1b2..0a18ba9c3941 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
 @@ -867,12 +867,14 @@
@@ -644,7 +644,7 @@ index 511ca864c1b..0a18ba9c394 100644
 2.44.0
 
 
-From 224246acc01891f6760d2a2004aa9757c97b12c5 Mon Sep 17 00:00:00 2001
+From d997113728dba1e1dcb4d4de10b4c60f6863ef6f Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Mon, 27 Aug 2018 19:03:49 +0000
 Subject: [PATCH 04/15] dts: rk3288-veyron-chromebook: dedicate npll to
@@ -661,7 +661,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  1 file changed, 62 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
-index 700bb548d6b..15086bd40a4 100644
+index 700bb548d6b2..15086bd40a45 100644
 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 @@ -83,6 +83,68 @@
@@ -737,7 +737,7 @@ index 700bb548d6b..15086bd40a4 100644
 2.44.0
 
 
-From cf3632a4654bc56b82031358aedabe2449430511 Mon Sep 17 00:00:00 2001
+From d075ccb8b05aefae50e5101df7d45a75cc52fda9 Mon Sep 17 00:00:00 2001
 From: SolidHal <hal@halemmerich.com>
 Date: Sun, 21 Oct 2018 16:40:15 -0500
 Subject: [PATCH 05/15] Added a second reset when having an issue reading the
@@ -760,7 +760,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index 657772546b6..ab3e5dee00a 100644
+index 657772546b6b..ab3e5dee00a4 100644
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
 @@ -1051,6 +1051,7 @@ static unsigned int mmc_blk_data_timeout_ms(struct mmc_host *host,
@@ -790,7 +790,7 @@ index 657772546b6..ab3e5dee00a 100644
 2.44.0
 
 
-From 92a1d2e4680b9ae3c1137e03474ae6bf9732468a Mon Sep 17 00:00:00 2001
+From 867e8b54709cfd0b3bb2354597f9db5e8c3d1aaf Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Tue, 9 Oct 2018 22:01:07 +0200
 Subject: [PATCH 06/15] block: partitions: efi: Ignore bizarre Chromebook GPT
@@ -830,7 +830,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
  2 files changed, 25 insertions(+), 11 deletions(-)
 
 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
-index 5e9be13a56a..8cdfcc48558 100644
+index 5e9be13a56a8..8cdfcc48558c 100644
 --- a/block/partitions/efi.c
 +++ b/block/partitions/efi.c
 @@ -328,23 +328,34 @@ static gpt_header *alloc_read_gpt_header(struct parsed_partitions *state,
@@ -926,7 +926,7 @@ index 5e9be13a56a..8cdfcc48558 100644
          }
  
 diff --git a/block/partitions/efi.h b/block/partitions/efi.h
-index 84b9f36b9e4..09726227e89 100644
+index 84b9f36b9e47..09726227e891 100644
 --- a/block/partitions/efi.h
 +++ b/block/partitions/efi.h
 @@ -26,7 +26,8 @@
@@ -943,7 +943,7 @@ index 84b9f36b9e4..09726227e89 100644
 2.44.0
 
 
-From 63be77a8a9f2d4575281861ad4745aef8837ed62 Mon Sep 17 00:00:00 2001
+From 97bcfb7ea78d2c0043b1c8c32860b8601ad4fd77 Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Tue, 30 Oct 2018 22:44:54 +0100
 Subject: [PATCH 07/15] mmc: Added a flag to disable cache flush during reset
@@ -966,7 +966,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
  3 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
-index 67230d486c2..b376544e93d 100644
+index 67230d486c28..b376544e93dd 100644
 --- a/drivers/mmc/core/host.c
 +++ b/drivers/mmc/core/host.c
 @@ -409,6 +409,8 @@ int mmc_of_parse(struct mmc_host *host)
@@ -979,7 +979,7 @@ index 67230d486c2..b376544e93d 100644
  	/* Must be after "non-removable" check */
  	if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {
 diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index 7e39017e440..a8406756299 100644
+index 7e39017e440f..a8406756299d 100644
 --- a/drivers/mmc/core/mmc.c
 +++ b/drivers/mmc/core/mmc.c
 @@ -2238,6 +2238,12 @@ static int mmc_runtime_resume(struct mmc_host *host)
@@ -1016,7 +1016,7 @@ index 7e39017e440..a8406756299 100644
  	if ((host->caps & MMC_CAP_HW_RESET) && host->ops->card_hw_reset &&
  	     mmc_can_reset(card)) {
 diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
-index 8f918f9a122..e8dd4fee431 100644
+index 8f918f9a1228..e8dd4fee4316 100644
 --- a/include/linux/mmc/host.h
 +++ b/include/linux/mmc/host.h
 @@ -421,6 +421,7 @@ struct mmc_host {
@@ -1031,7 +1031,7 @@ index 8f918f9a122..e8dd4fee431 100644
 2.44.0
 
 
-From c23a272957ee48f54824dd6de6e2a32dff83bcd5 Mon Sep 17 00:00:00 2001
+From af2fc9eba49416fe6ca144eb7a1fc4d4aab583f0 Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Thu, 1 Nov 2018 21:31:26 +0100
 Subject: [PATCH 08/15] arm: dts: veyron: Added a flag to disable cache flush
@@ -1049,7 +1049,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
-index e406c8c7c7e..bb016584854 100644
+index e406c8c7c7e5..bb0165848545 100644
 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi
 +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
 @@ -153,6 +153,7 @@
@@ -1064,7 +1064,7 @@ index e406c8c7c7e..bb016584854 100644
 2.44.0
 
 
-From 00bfabf08f7be308703641fca359ab9d082c0213 Mon Sep 17 00:00:00 2001
+From fa7843c4d26b81c41cc67892c55e36f589c0be4d Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Mon, 18 Mar 2019 22:40:52 +0000
 Subject: [PATCH 09/15] dwc2 veyron otg mode hack
@@ -1078,7 +1078,7 @@ Subject: [PATCH 09/15] dwc2 veyron otg mode hack
  5 files changed, 55 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
-index bb016584854..de5a13311aa 100644
+index bb0165848545..de5a13311aaa 100644
 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi
 +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
 @@ -436,8 +436,8 @@
@@ -1092,7 +1092,7 @@ index bb016584854..de5a13311aa 100644
  
  &vopb {
 diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
-index 5635e4d7ec8..58b864d0aae 100644
+index 5635e4d7ec88..58b864d0aaea 100644
 --- a/drivers/usb/dwc2/core.c
 +++ b/drivers/usb/dwc2/core.c
 @@ -547,7 +547,7 @@ void dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host)
@@ -1105,7 +1105,7 @@ index 5635e4d7ec8..58b864d0aae 100644
  	u32 gusbcfg;
  
 diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
-index b106c0e0b77..60f5c5f8f2a 100644
+index b106c0e0b77b..60f5c5f8f2ae 100644
 --- a/drivers/usb/dwc2/core.h
 +++ b/drivers/usb/dwc2/core.h
 @@ -1311,6 +1311,7 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy);
@@ -1117,7 +1117,7 @@ index b106c0e0b77..60f5c5f8f2a 100644
  bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);
  
 diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
-index 1d72ece9cfe..3e0a09c14c9 100644
+index 1d72ece9cfe4..3e0a09c14c97 100644
 --- a/drivers/usb/dwc2/debugfs.c
 +++ b/drivers/usb/dwc2/debugfs.c
 @@ -114,6 +114,55 @@ static const struct file_operations testmode_fops = {
@@ -1185,7 +1185,7 @@ index 1d72ece9cfe..3e0a09c14c9 100644
  	/* Create one file for each out endpoint */
  	for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
 diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
-index 2e4c6884f36..1c6dec03bfd 100644
+index 2e4c6884f36a..1c6dec03bfd9 100644
 --- a/drivers/usb/dwc2/platform.c
 +++ b/drivers/usb/dwc2/platform.c
 @@ -499,6 +499,8 @@ static int dwc2_driver_probe(struct platform_device *dev)
@@ -1201,7 +1201,7 @@ index 2e4c6884f36..1c6dec03bfd 100644
 2.44.0
 
 
-From 5e6dfb2b238a7440064e4e880b8ac74514e1e8e3 Mon Sep 17 00:00:00 2001
+From c275b68360ee52e990ad1441b384637ed52f04c7 Mon Sep 17 00:00:00 2001
 From: Hal Emmerich <hal@halemmerich.com>
 Date: Wed, 21 Aug 2019 16:52:41 -0500
 Subject: [PATCH 10/15] Fix ath9k dwc2 init frame overruns
@@ -1220,7 +1220,7 @@ communicate properly. In my testing this did not impact network speeds.
  1 file changed, 10 insertions(+)
 
 diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
-index 0a1145592fc..a39c646485c 100644
+index 0a1145592fc7..a39c646485cc 100644
 --- a/drivers/usb/dwc2/hcd_queue.c
 +++ b/drivers/usb/dwc2/hcd_queue.c
 @@ -1528,6 +1528,16 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
@@ -1244,7 +1244,7 @@ index 0a1145592fc..a39c646485c 100644
 2.44.0
 
 
-From a594e54bb62d232065b5e0960c0fc29ead0b3aef Mon Sep 17 00:00:00 2001
+From 26f2793b49007d683ab76491c28393e86f29a773 Mon Sep 17 00:00:00 2001
 From: barzur <boris@konbu.org>
 Date: Fri, 12 Jul 2019 11:33:32 +0900
 Subject: [PATCH 11/15] usb/dwc2/hcd: channel halt may not be an error
@@ -1284,7 +1284,7 @@ meantime I'm including it here.
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index dd5b1c5691e..e3c21829d4b 100644
+index dd5b1c5691e1..e3c21829d4b3 100644
 --- a/drivers/usb/dwc2/hcd.c
 +++ b/drivers/usb/dwc2/hcd.c
 @@ -2457,7 +2457,8 @@ static void dwc2_free_dma_aligned_buffer(struct urb *urb)
@@ -1298,7 +1298,7 @@ index dd5b1c5691e..e3c21829d4b 100644
  	kfree(urb->transfer_buffer);
  	urb->transfer_buffer = stored_xfer_buffer;
 diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
-index 9e85cbb0c4f..a75ded5d853 100644
+index 9e85cbb0c4f1..a75ded5d8536 100644
 --- a/drivers/usb/dwc2/hcd_intr.c
 +++ b/drivers/usb/dwc2/hcd_intr.c
 @@ -1935,7 +1935,8 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
@@ -1315,7 +1315,7 @@ index 9e85cbb0c4f..a75ded5d853 100644
 2.44.0
 
 
-From b26e83c259ba12de2c427a1338b68771e0318d5c Mon Sep 17 00:00:00 2001
+From c90e72699ec31dae3c8b86d7a3dd47dca544d058 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Tue, 8 Oct 2019 11:03:37 +0000
 Subject: [PATCH 12/15] drm/panel: edp: Extend Innolux N116BGE mode info for
@@ -1327,7 +1327,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c
-index 2c14779a39e..162d5e76a40 100644
+index 2c14779a39e8..162d5e76a40c 100644
 --- a/drivers/gpu/drm/panel/panel-edp.c
 +++ b/drivers/gpu/drm/panel/panel-edp.c
 @@ -1337,16 +1337,25 @@ static const struct panel_desc innolux_n116bca_ea1 = {
@@ -1362,7 +1362,7 @@ index 2c14779a39e..162d5e76a40 100644
 2.44.0
 
 
-From d50417ad7a1cd43f18596bb6b75cd1132ce2ec6a Mon Sep 17 00:00:00 2001
+From 9e4618b6782bb359147f099874a87311d2d990c7 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Tue, 8 Oct 2019 11:12:33 +0000
 Subject: [PATCH 13/15] ARM: dts: rockchip: Adjust rk3288-veyron n116bge mode
@@ -1378,7 +1378,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi
-index 32c0f10765d..ea20818202f 100644
+index 32c0f10765dd..ea20818202fc 100644
 --- a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi
 +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi
 @@ -62,13 +62,13 @@
@@ -1401,7 +1401,7 @@ index 32c0f10765d..ea20818202f 100644
 2.44.0
 
 
-From 8c1d94680f791a5709035dab9d7e37a2aca45e2c Mon Sep 17 00:00:00 2001
+From 36a869c3475b92dfd6732ae5b563c085eceae43b Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Tue, 28 Sep 2021 20:23:13 +0300
 Subject: [PATCH 14/15] Revert "clk: divider: Implement and wire up
@@ -1416,7 +1416,7 @@ in my tree to be able to test the rest of 5.15 rc's.
  1 file changed, 23 deletions(-)
 
 diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
-index a2c2b5203b0..9a63a0447d6 100644
+index a2c2b5203b0a..9a63a0447d6f 100644
 --- a/drivers/clk/clk-divider.c
 +++ b/drivers/clk/clk-divider.c
 @@ -446,27 +446,6 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
@@ -1467,7 +1467,7 @@ index a2c2b5203b0..9a63a0447d6 100644
 2.44.0
 
 
-From 38b5f618ed584672e17e12347e4c9153075dc58c Mon Sep 17 00:00:00 2001
+From 80791dbb9450994048eb2ef0edf0971bce1b5a59 Mon Sep 17 00:00:00 2001
 From: Urja Rannikko <urjaman@gmail.com>
 Date: Mon, 25 Dec 2023 18:06:10 +0200
 Subject: [PATCH 15/15] dts: veyron: bluetooth: disable dma on uart0
@@ -1479,7 +1479,7 @@ https://codeberg.org/petms/linux-veyron-patches-and-apkbuild
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 0a18ba9c394..5feaf922e1a 100644
+index 0a18ba9c3941..5feaf922e1a5 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
 @@ -378,8 +378,6 @@
diff --git a/kernel.its b/kernel.its
index a4fab88..5a39eb2 100644
--- a/kernel.its
+++ b/kernel.its
@@ -4,7 +4,7 @@
     description = "Chrome OS kernel image with one or more FDT blobs";
     #address-cells = <1>;
     images {
-        kernel@1 {
+        kernel {
             description = "kernel";
             data = /incbin/("arch/arm/boot/zImage");
             type = "kernel_noload";
@@ -14,22 +14,106 @@
             load = <0>;
             entry = <0>;
         };
-        fdt@1 {
+        fdt-veyron-brain {
+            description = "rk3288-veyron-brain.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-brain.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-jaq {
+            description = "rk3288-veyron-jaq.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-jaq.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-jerry {
+            description = "rk3288-veyron-jerry.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-jerry.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-mickey {
+            description = "rk3288-veyron-mickey.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-mickey.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-minnie {
+            description = "rk3288-veyron-minnie.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-minnie.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-pinky {
+            description = "rk3288-veyron-pinky.dtb";
+            data = /incbin/("arch/arm/boot/dts/rk3288-veyron-pinky.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash {
+                algo = "sha1";
+            };
+        };
+        fdt-veyron-speedy {
             description = "rk3288-veyron-speedy.dtb";
             data = /incbin/("arch/arm/boot/dts/rk3288-veyron-speedy.dtb");
             type = "flat_dt";
             arch = "arm";
             compression = "none";
-            hash@1 {
+            hash {
                 algo = "sha1";
             };
         };
     };
     configurations {
-        default = "conf@1";
-        conf@1 {
-            kernel = "kernel@1";
-            fdt = "fdt@1";
+        default = "conf-veyron-speedy";
+        conf-veyron-brain {
+            kernel = "kernel";
+            fdt = "fdt-veyron-brain";
+        };
+        conf-veyron-jaq {
+            kernel = "kernel";
+            fdt = "fdt-veyron-jaq";
+        };
+        conf-veyron-jerry {
+            kernel = "kernel";
+            fdt = "fdt-veryon-jerry";
+        };
+        conf-veyron-mickey {
+            kernel = "kernel";
+            fdt = "fdt-veyron-mickey";
+        };
+        conf-veyron-minnie {
+            kernel = "kernel";
+            fdt = "fdt-veyron-minnie";
+        };
+        conf-veyron-pinky {
+            kernel = "kernel";
+            fdt = "fdt-veyron-pinky";
+        };
+        conf-veyron-speedy {
+            kernel = "kernel";
+            fdt = "fdt-veyron-speedy";
         };
     };
 };