From 8e7afdbb87a4ed790b938dc52dc5f09e397784e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 14 Mar 2023 17:19:11 +0000 Subject: [PATCH] 2023.04 RC4 --- ...nitial-support-for-the-PinePhone-Pro.patch | 12 +- ...erties-from-firmware-DT-to-loaded-DT.patch | 215 ++---------------- ...-the-DT-provided-by-the-Raspberry-Pi.patch | 79 +++++-- rpi-Update-the-RPi-Zero-2W-DT-filename.patch | 29 +++ sources | 2 +- uboot-tools.spec | 10 +- 6 files changed, 128 insertions(+), 219 deletions(-) create mode 100644 rpi-Update-the-RPi-Zero-2W-DT-filename.patch diff --git a/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch b/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch index d127522..337ea8c 100644 --- a/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch +++ b/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch @@ -1,6 +1,6 @@ -From a23687b77c1e0b5be7f0443e5fba9d9bb7514b6b Mon Sep 17 00:00:00 2001 +From 72400858605c085cf94a6cf5599269c8c39e3e72 Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Sun, 1 Jan 2023 02:11:29 +0000 +Date: Tue, 14 Mar 2023 12:30:36 +0000 Subject: [PATCH] rockchip: pinephone pro: add initial display support Add proposed upstream DT patches for display, disable edp, @@ -206,12 +206,12 @@ index 04403a76238..d0609d1b534 100644 + status = "okay"; +}; diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig -index eb979f6c051..25941abc93a 100644 +index 54f9b90536c..1982131c805 100644 --- a/configs/pinephone-pro-rk3399_defconfig +++ b/configs/pinephone-pro-rk3399_defconfig -@@ -99,6 +99,7 @@ CONFIG_USB_ETHER_RTL8152=y - CONFIG_DISPLAY=y +@@ -96,6 +96,7 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_VIDEO=y + CONFIG_DISPLAY=y CONFIG_VIDEO_ROCKCHIP=y -CONFIG_DISPLAY_ROCKCHIP_EDP=y +CONFIG_DISPLAY_ROCKCHIP_MIPI=y @@ -232,5 +232,5 @@ index 211faf8fa89..7866e5266d2 100644 #define FCLK_CM0S 190 -- -2.39.1 +2.39.2 diff --git a/rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch b/rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch index 7ef65bc..2a78fe5 100644 --- a/rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch +++ b/rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch @@ -1,98 +1,7 @@ -From patchwork Wed Aug 10 12:39:26 2022 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Antoine Mazeas -X-Patchwork-Id: 1665242 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: bilbo.ozlabs.org; - dkim=pass (1024-bit key; - unprotected) header.d=karthanis.net header.i=@karthanis.net - header.a=rsa-sha256 header.s=20191114 header.b=mcrC/rnn; - dkim-atps=neutral -Authentication-Results: ozlabs.org; - spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de - (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; receiver=) -Received: from phobos.denx.de (phobos.denx.de - [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange X25519 server-signature RSA-PSS (2048 bits)) - (No client certificate requested) - by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M2qkM6g8Vz9ryY - for ; Wed, 10 Aug 2022 22:58:35 +1000 (AEST) -Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) - by phobos.denx.de (Postfix) with ESMTP id CB5EF842A3; - Wed, 10 Aug 2022 14:58:11 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=karthanis.net -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de -Authentication-Results: phobos.denx.de; - dkim=pass (1024-bit key; - unprotected) header.d=karthanis.net header.i=@karthanis.net - header.b="mcrC/rnn"; - dkim-atps=neutral -Received: by phobos.denx.de (Postfix, from userid 109) - id 4FB14841DC; Wed, 10 Aug 2022 14:40:46 +0200 (CEST) -X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, - T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 -Received: from smtp-42a9.mail.infomaniak.ch (smtp-42a9.mail.infomaniak.ch - [IPv6:2001:1600:3:17::42a9]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) - (No client certificate requested) - by phobos.denx.de (Postfix) with ESMTPS id CCC6784084 - for ; Wed, 10 Aug 2022 14:40:43 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=karthanis.net -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=antoine@karthanis.net -Received: from smtp-3-0001.mail.infomaniak.ch (unknown [10.4.36.108]) - by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4M2qKl3S6GzMqbyx; - Wed, 10 Aug 2022 14:40:43 +0200 (CEST) -Received: from localhost.localdomain (unknown [88.168.170.86]) - by smtp-3-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4M2qKk6qXKzlnSD1; - Wed, 10 Aug 2022 14:40:42 +0200 (CEST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=karthanis.net; - s=20191114; t=1660135243; - bh=YF4GTVv5pqqW0OMrNZFlf0WHnELr1KiKKA02ok/znf4=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=mcrC/rnnUv3FXlrllL2s9lLTjUEnTuLbiINuyrIQWr2HG3AmCcD11F7n0AypUdePp - 2XfG1PnZalJa2v3m6/DUWsz6B/cqmYo31h/6HpFeJ4g2i1pEZar7cC+9oScmbjJptV - w2oDsFHzyK2oWHUMGFJ4N6bboD8kq3z4WLaH2vrQ= +From 6d0642494993f39440a4d6e95f88c0456ee6d689 Mon Sep 17 00:00:00 2001 From: Antoine Mazeas -To: u-boot@lists.denx.de -Cc: Antoine Mazeas , - Sjoerd Simons -Subject: [PATCH 1/2] rpi: Copy properties from firmware dtb to the loaded dtb -Date: Wed, 10 Aug 2022 14:39:26 +0200 -Message-Id: <20220810123927.2567677-2-antoine@karthanis.net> -X-Mailer: git-send-email 2.37.1 -In-Reply-To: <20220810123927.2567677-1-antoine@karthanis.net> -References: <20220810123927.2567677-1-antoine@karthanis.net> -MIME-Version: 1.0 -X-Mailman-Approved-At: Wed, 10 Aug 2022 14:58:03 +0200 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.39 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" -X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de -X-Virus-Status: Clean +Date: Fri, 19 Aug 2022 10:56:45 +0200 +Subject: [PATCH 1/3] rpi: Copy properties from firmware dtb to the loaded dtb The RPI firmware adjusts several property values in the dtb it passes to u-boot depending on the board/SoC revision. Inherit some of these @@ -110,15 +19,18 @@ when u-boot loads a dtb itself. Specificaly copy: of that. Signed-off-by: Sjoerd Simons +Signed-off-by: Antoine Mazeas +Reviewed-by: Simon Glass +Signed-off-by: Peter Robinson --- board/raspberrypi/rpi/rpi.c | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 17b8108cc8..28b6f52506 100644 +index 8603c93de77..d4b059c6204 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c -@@ -504,10 +504,58 @@ void *board_fdt_blob_setup(int *err) +@@ -503,10 +503,58 @@ void *board_fdt_blob_setup(int *err) return (void *)fw_dtb_pointer; } @@ -177,114 +89,30 @@ index 17b8108cc8..28b6f52506 100644 node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer"); if (node < 0) fdt_simplefb_add_node(blob); +-- +2.39.2 -From patchwork Wed Aug 10 12:39:27 2022 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Antoine Mazeas -X-Patchwork-Id: 1665243 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: bilbo.ozlabs.org; - dkim=pass (1024-bit key; - unprotected) header.d=karthanis.net header.i=@karthanis.net - header.a=rsa-sha256 header.s=20191114 header.b=3Vltv92i; - dkim-atps=neutral -Authentication-Results: ozlabs.org; - spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de - (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; receiver=) -Received: from phobos.denx.de (phobos.denx.de - [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange X25519 server-signature RSA-PSS (2048 bits)) - (No client certificate requested) - by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M2qkb5v6sz9ryY - for ; Wed, 10 Aug 2022 22:58:47 +1000 (AEST) -Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) - by phobos.denx.de (Postfix) with ESMTP id 2E6C784564; - Wed, 10 Aug 2022 14:58:17 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=karthanis.net -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de -Authentication-Results: phobos.denx.de; - dkim=pass (1024-bit key; - unprotected) header.d=karthanis.net header.i=@karthanis.net - header.b="3Vltv92i"; - dkim-atps=neutral -Received: by phobos.denx.de (Postfix, from userid 109) - id 274CF8415B; Wed, 10 Aug 2022 14:40:48 +0200 (CEST) -X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, - T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 -Received: from smtp-42a9.mail.infomaniak.ch (smtp-42a9.mail.infomaniak.ch - [84.16.66.169]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) - (No client certificate requested) - by phobos.denx.de (Postfix) with ESMTPS id DAC58841A4 - for ; Wed, 10 Aug 2022 14:40:45 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=pass (p=none dis=none) header.from=karthanis.net -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=antoine@karthanis.net -Received: from smtp-3-0001.mail.infomaniak.ch (unknown [10.4.36.108]) - by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4M2qKn4VzjzMqnFS; - Wed, 10 Aug 2022 14:40:45 +0200 (CEST) -Received: from localhost.localdomain (unknown [88.168.170.86]) - by smtp-3-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4M2qKn1TBqzlnSCc; - Wed, 10 Aug 2022 14:40:45 +0200 (CEST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=karthanis.net; - s=20191114; t=1660135245; - bh=f61vvBG7E2UozLHxeE7zghMr3kXQzBW+5PpzEyEGYJU=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=3Vltv92i/KGKD06qHi+zyrqGwfJWUvdwHMojKKH7OqswhScJTxhUbGq6MnPrCqWsn - QgB117zr++vQSy1jxV2vZIFLxMC3j8AZb4l3ktmU7FiPp7AUB6AqAzv+tUrYeS3nz4 - LQ0mJS4s1jk1k0WWAK3/WGdOyUAo8ZWw5oiBHUvk= +From 4a45086c0ca874858d4064ee26d45199bcab494d Mon Sep 17 00:00:00 2001 From: Antoine Mazeas -To: u-boot@lists.denx.de -Cc: Antoine Mazeas -Subject: [PATCH 2/2] rpi: Copy eth PHY address from fw DT to loaded DT -Date: Wed, 10 Aug 2022 14:39:27 +0200 -Message-Id: <20220810123927.2567677-3-antoine@karthanis.net> -X-Mailer: git-send-email 2.37.1 -In-Reply-To: <20220810123927.2567677-1-antoine@karthanis.net> -References: <20220810123927.2567677-1-antoine@karthanis.net> -MIME-Version: 1.0 -X-Mailman-Approved-At: Wed, 10 Aug 2022 14:58:03 +0200 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.39 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" -X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de -X-Virus-Status: Clean +Date: Fri, 19 Aug 2022 10:56:46 +0200 +Subject: [PATCH 2/3] rpi: Copy eth PHY address from fw DT to loaded DT -Some Raspberry Pi 400 boards, specifically rev 1.1, have a different address for the ethernet PHY device than what is provided by the kernel DTB. The correct address is provided by the firmware, so we should carry it over into the loaded device tree so that ethernet works on such boards. +Some Raspberry Pi 400 boards, specifically rev 1.1, have a different +address for the ethernet PHY device than what is provided by the kernel +DTB. The correct address is provided by the firmware, so we should carry +it over into the loaded device tree so that ethernet works on such boards. Signed-off-by: Antoine Mazeas +Signed-off-by: Peter Robinson --- board/raspberrypi/rpi/rpi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 28b6f52506..793fd1aa30 100644 +index d4b059c6204..fc1fffedfb7 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c -@@ -548,6 +548,9 @@ void update_fdt_from_fw(void *fdt, void *fw_fdt) +@@ -547,6 +547,9 @@ void update_fdt_from_fw(void *fdt, void *fw_fdt) /* kernel address randomisation seed as provided by the firmware */ copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed"); @@ -294,3 +122,6 @@ index 28b6f52506..793fd1aa30 100644 } int ft_board_setup(void *blob, struct bd_info *bd) +-- +2.39.2 + diff --git a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch index c156e4d..fd032fe 100644 --- a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch +++ b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch @@ -1,7 +1,13 @@ -From f10f94831450671a77f61fe413b4a57459963860 Mon Sep 17 00:00:00 2001 +From 52b75976133683dc9fe66e8ad35127125f938bed Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Mon, 10 Aug 2020 22:20:29 +0100 -Subject: [PATCH] rpi: Use firmware provided device tree +Date: Tue, 28 Feb 2023 12:04:34 +0000 +Subject: [PATCH 2/2] rpi: Use OF_BOARD rather than OF_EMBED + +The use of OF_EMBED isn't recommended for standard use and the OF_BOARD +is actually a better fit for the Raspberry Pi as the prior firmware +provides a DT that can be used by U-Boot and the subsequent OS too, but +it still allows the loading of a DT from disk as well if users wish +to use the upstream kernel DT. Signed-off-by: Peter Robinson --- @@ -10,14 +16,17 @@ Signed-off-by: Peter Robinson configs/rpi_3_32b_defconfig | 2 +- configs/rpi_3_b_plus_defconfig | 2 +- configs/rpi_3_defconfig | 2 +- + configs/rpi_4_32b_defconfig | 1 + + configs/rpi_4_defconfig | 1 + + configs/rpi_arm64_defconfig | 1 + configs/rpi_defconfig | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) + 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index bba5e12b12..0241f4c6d3 100644 +index 5249b29d76c..8c217848ca2 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig -@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y +@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -27,10 +36,10 @@ index bba5e12b12..0241f4c6d3 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 1c2bbb29ce..9573e475f4 100644 +index 154284765f4..bfc5679fb7e 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y +@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -40,10 +49,10 @@ index 1c2bbb29ce..9573e475f4 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index b8a3d17f43..252df994e6 100644 +index ef1f25d2ad7..54cdcee980a 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y +@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -53,10 +62,10 @@ index b8a3d17f43..252df994e6 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig -index 4c361438fa..3b2996a2f9 100644 +index 154615d78a1..3008c7a1c18 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y +@@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -66,10 +75,10 @@ index 4c361438fa..3b2996a2f9 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index 9b281a4f15..1e9ee6122e 100644 +index f0cf7f8e236..f7b9108ba00 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y +@@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -78,11 +87,47 @@ index 9b281a4f15..1e9ee6122e 100644 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +index 713b2ee231c..fa20ab767fe 100644 +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -24,6 +24,7 @@ CONFIG_CMD_MMC=y + CONFIG_CMD_PCI=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +index 24f70b14fe8..741d4dbbbf4 100644 +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -24,6 +24,7 @@ CONFIG_CMD_MMC=y + CONFIG_CMD_PCI=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig +index 1d1ff12a58c..5e1195dd786 100644 +--- a/configs/rpi_arm64_defconfig ++++ b/configs/rpi_arm64_defconfig +@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y + CONFIG_CMD_PCI=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y + CONFIG_TFTP_TSIZE=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index b5ad53c37b..223fc03275 100644 +index 28b92b14456..1504093eddf 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig -@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y +@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -92,5 +137,5 @@ index b5ad53c37b..223fc03275 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -- -2.26.2 +2.39.2 diff --git a/rpi-Update-the-RPi-Zero-2W-DT-filename.patch b/rpi-Update-the-RPi-Zero-2W-DT-filename.patch new file mode 100644 index 0000000..b53c050 --- /dev/null +++ b/rpi-Update-the-RPi-Zero-2W-DT-filename.patch @@ -0,0 +1,29 @@ +From 0e8c94054fd80535e868900deb978a9a1ebcab67 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Tue, 28 Feb 2023 10:17:26 +0000 +Subject: [PATCH 3/3] rpi: Update the RPi Zero 2W DT filename + +Update the Raspberry Pi Zero 2W device tree file +name to match what landed upstream. + +Signed-off-by: Peter Robinson +--- + board/raspberrypi/rpi/rpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index fc1fffedfb7..1057ebb9948 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -158,7 +158,7 @@ static const struct rpi_model rpi_models_new_scheme[] = { + }, + [0x12] = { + "Zero 2 W", +- DTB_DIR "bcm2837-rpi-zero-2.dtb", ++ DTB_DIR "bcm2837-rpi-zero-2-w.dtb", + false, + }, + [0x13] = { +-- +2.39.2 + diff --git a/sources b/sources index 766a5a0..05b4824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2023.04-rc2.tar.bz2) = 7de3513fc07ce67c11144cadccfa7e21d2de7dbb22d051822a5890396caf2109f5ee12ebdc8bb1c3f77bec26fee032bae2c2e243e8f3a0cc390057f700d76cf0 +SHA512 (u-boot-2023.04-rc4.tar.bz2) = b40349d03abcbc0eb9061046071ff29578bf83007e70a0a57518763c1ef4b8a60c9c691c9921ac4d76135910a8053a4271a6d92346649d11d01b6997c4b09254 diff --git a/uboot-tools.spec b/uboot-tools.spec index 5c88e27..4ca6fa6 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,4 +1,4 @@ -%global candidate rc2 +%global candidate rc4 %if 0%{?rhel} %bcond_with toolsonly %else @@ -7,7 +7,7 @@ Name: uboot-tools Version: 2023.04 -Release: 0.2%{?candidate:.%{candidate}}%{?dist} +Release: 0.3%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -27,8 +27,9 @@ Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch4: rpi-fallback-to-max-clock-for-mmc.patch Patch5: rpi-bcm2835_sdhost-firmware-managed-clock.patch Patch6: rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch +Patch7: rpi-Update-the-RPi-Zero-2W-DT-filename.patch # Rockchips improvements -Patch7: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch +Patch8: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch BuildRequires: bc BuildRequires: bison @@ -211,6 +212,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand %endif %changelog +* Tue Mar 14 2023 Peter Robinson - 2023.04-0.3.rc4 +- Update to 2023.04 RC4 + * Fri Feb 17 2023 Peter Robinson - 2023.04-0.2.rc2 - Update to 2023.04 RC2