update to u-boot 2023.10

Signed-off-by: John Clark <[email protected]>
inindev · Oct 10, 2023 · e9e142d · e9e142d
1 parent 2f4fa2c
commit e9e142d
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 927 deletions.
diff --git a/uboot/make_uboot.sh b/uboot/make_uboot.sh
@@ -7,7 +7,7 @@ set -e
 #   6: invalid config
 
 main() {
-    local utag='v2023.07.02'
+    local utag='v2023.10'
     local atf_file='../rkbin/rk3568_bl31_v1.28.elf'
     local tpl_file='../rkbin/rk3568_ddr_1560MHz_v1.15.bin'
 
@@ -87,137 +87,45 @@ main() {
 }
 
 cherry_pick() {
-    # regulator: implement basic reference counter
-    # https://github.com/u-boot/u-boot/commit/4fcba5d556b4224ad65a249801e4c9594d1054e8
-    git -C u-boot cherry-pick 4fcba5d556b4224ad65a249801e4c9594d1054e8
+    # pci: pcie_dw_rockchip: Configure number of lanes and link width speed
+    # https://github.com/u-boot/u-boot/commit/9af0c7732bf1df29138bb63712dc3fcbc6d821af
+    git -C u-boot cherry-pick 9af0c7732bf1df29138bb63712dc3fcbc6d821af
 
-    # regulator: rename dev_pdata to plat
-    # https://github.com/u-boot/u-boot/commit/29fca9f23a3b730cbf91c18617e25d9d8e3a26b7
-    git -C u-boot cherry-pick 29fca9f23a3b730cbf91c18617e25d9d8e3a26b7
+    # phy: rockchip: snps-pcie3: Refactor to use clk_bulk API
+    # https://github.com/u-boot/u-boot/commit/3b39592e8e245fc5c7b0a003ac65672ce9cfaf0f
+    git -C u-boot cherry-pick 3b39592e8e245fc5c7b0a003ac65672ce9cfaf0f
 
-    # dm: core: of_access: fix return value in of_property_match_string
-    # https://github.com/u-boot/u-boot/commit/15a2865515fdd77d1edbc10e275b7b5a4914aa79
-    git -C u-boot cherry-pick 15a2865515fdd77d1edbc10e275b7b5a4914aa79
+    # phy: rockchip: snps-pcie3: Refactor to use a phy_init ops
+    # https://github.com/u-boot/u-boot/commit/6cacdf842db5e62e9c26d015eddadd2f2410a6de
+    git -C u-boot cherry-pick 6cacdf842db5e62e9c26d015eddadd2f2410a6de
 
-    # rockchip: rk3568: Add support for FriendlyARM NanoPi R5S
-    # https://github.com/u-boot/u-boot/commit/0ef326b5e92ee7c0f3cd27385510eb5c211b10fb
-    git -C u-boot cherry-pick 0ef326b5e92ee7c0f3cd27385510eb5c211b10fb
+    # phy: rockchip: snps-pcie3: Add bifurcation support for RK3568
+    # https://github.com/u-boot/u-boot/commit/1ebebfcc25bc8963cbdc6e35504160e5b745cabd
+    git -C u-boot cherry-pick 1ebebfcc25bc8963cbdc6e35504160e5b745cabd
 
-    # rockchip: rk3568: Add support for FriendlyARM NanoPi R5C
-    # https://github.com/u-boot/u-boot/commit/6a73211d4bb12d62ce82b33cee7d75d215a3d452
-    git -C u-boot cherry-pick 6a73211d4bb12d62ce82b33cee7d75d215a3d452
+    # phy: rockchip: naneng-combphy: Use signal from comb PHY on RK3588
+    # https://github.com/u-boot/u-boot/commit/b37260bca1aa562c6c99527d997c768a12da017b
+    git -C u-boot cherry-pick b37260bca1aa562c6c99527d997c768a12da017b
 
-    # rockchip: rk3568: Fix alloc space exhausted in SPL
-    # https://github.com/u-boot/u-boot/commit/52472504e9c48cc1b34e0942c0075cd111ea85f0
-    git -C u-boot cherry-pick 52472504e9c48cc1b34e0942c0075cd111ea85f0
+    # rockchip: rk3568-nanopi-r5: Update defconfig for NanoPi R5C and R5S
+    # https://github.com/u-boot/u-boot/commit/5b155997d445f770e9a2c0d4a20e4eb13eedfede
+    git -C u-boot cherry-pick 5b155997d445f770e9a2c0d4a20e4eb13eedfede
 
-    # core: read: add dev_read_addr_size_index_ptr function
-    # https://github.com/u-boot/u-boot/commit/5e030632d49367944879e17a6d73828be22edd55
-    git -C u-boot cherry-pick 5e030632d49367944879e17a6d73828be22edd55
+    # rockchip: rk3568-nanopi-r5: Enable PCIe on NanoPi R5C and R5S
+    # https://github.com/u-boot/u-boot/commit/a9e9445ea2bb010444621e563a79bc33fe064f9c
+    git -C u-boot cherry-pick a9e9445ea2bb010444621e563a79bc33fe064f9c
 
-    # pci: pcie_dw_rockchip: Get config region from reg prop
-    # https://github.com/u-boot/u-boot/commit/bed7b2f00b1346f712f849d53c72fa8642601115
-    git -C u-boot cherry-pick bed7b2f00b1346f712f849d53c72fa8642601115
+    # power: regulator: Only run autoset once for each regulator
+    # https://github.com/u-boot/u-boot/commit/d99fb64a98af3bebf6b0c134291c4fb89e177aa2
+    git -C u-boot cherry-pick d99fb64a98af3bebf6b0c134291c4fb89e177aa2
 
-    # pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed
-    # https://github.com/u-boot/u-boot/commit/8b001ee59a9d4a6246098c8bc5bb894a752e7c0b
-    git -C u-boot cherry-pick 8b001ee59a9d4a6246098c8bc5bb894a752e7c0b
+    # regulator: rk8xx: Return correct voltage for buck converters
+    # https://github.com/u-boot/u-boot/commit/04c38c6c4936f353de36be60655f402922292a37
+    git -C u-boot cherry-pick 04c38c6c4936f353de36be60655f402922292a37
 
-    # pci: pcie_dw_rockchip: Speed up link probe
-    # https://github.com/u-boot/u-boot/commit/7ce186ada2ce1ece344dacc20244fb91866e435b
-    git -C u-boot cherry-pick 7ce186ada2ce1ece344dacc20244fb91866e435b
-
-    # pci: pcie_dw_rockchip: Disable unused BARs of the root complex
-    # https://github.com/u-boot/u-boot/commit/bc6b94b5788677c3633e0331203578ffa706ff4b
-    git -C u-boot cherry-pick bc6b94b5788677c3633e0331203578ffa706ff4b
-
-    # regulator: fixed: Add support for gpios prop
-    # https://github.com/u-boot/u-boot/commit/f7b8a84a29833b6e6ddac67920d688330b299fa8
-    git -C u-boot cherry-pick f7b8a84a29833b6e6ddac67920d688330b299fa8
-
-    # rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support
-    # https://github.com/u-boot/u-boot/commit/583a82d5e2702f2c8aadcd75d416d6e45dd5188a
-    git -C u-boot cherry-pick 583a82d5e2702f2c8aadcd75d416d6e45dd5188a
-
-    # rockchip: rk3568-rock-3a: Enable PCIe and NVMe support
-    # https://github.com/u-boot/u-boot/commit/a76aa6ffa6cd25eed282147f6e31b9c09272f930
-    git -C u-boot cherry-pick a76aa6ffa6cd25eed282147f6e31b9c09272f930
-
-    # rockchip: rk356x: Update PCIe config, IO and memory regions
-    # https://github.com/u-boot/u-boot/commit/062b712999869bdd7d6283ab8eed50e5999ac88a
-    git -C u-boot cherry-pick 062b712999869bdd7d6283ab8eed50e5999ac88a
-
-    # ata: dwc_ahci: Fix support for other platforms
-    # https://github.com/u-boot/u-boot/commit/7af6616c961d213b4bf2cc88003cbd868ea11ffa
-    git -C u-boot cherry-pick 7af6616c961d213b4bf2cc88003cbd868ea11ffa
-
-    # cmd: ini: Fix build warning
-    # https://github.com/u-boot/u-boot/commit/8c1bb04b5699ce74ad727d4513e1a40a58c9c628
-    git -C u-boot cherry-pick 8c1bb04b5699ce74ad727d4513e1a40a58c9c628
-
-    # board: rockchip: Add Hardkernel ODROID-M1
-    # https://github.com/u-boot/u-boot/commit/94da929b933668c4b9ece7d56a2a2bb5543198c9
-    git -C u-boot cherry-pick 94da929b933668c4b9ece7d56a2a2bb5543198c9
-
-    # Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators for usb"
-    # https://github.com/u-boot/u-boot/commit/bec51f3fb316b5a5ccedd7deb2e58ae6d7443cfa
-    git -C u-boot cherry-pick bec51f3fb316b5a5ccedd7deb2e58ae6d7443cfa
-
-    # usb: dwc3-generic: Return early when there is no child node
-    # https://github.com/u-boot/u-boot/commit/4412a2bf0b674d7438821531a0a19bbcd4b80eda
-    git -C u-boot cherry-pick 4412a2bf0b674d7438821531a0a19bbcd4b80eda
-
-    # usb: dwc3-generic: Relax unsupported dr_mode check
-    # https://github.com/u-boot/u-boot/commit/6913c30516022f86104c9fbe315499e43eee4ed6
-    git -C u-boot cherry-pick 6913c30516022f86104c9fbe315499e43eee4ed6
-
-    # usb: dwc3-generic: Add rk3568 support
-    # https://github.com/u-boot/u-boot/commit/caaeac88466f4152bd126e2342765a4b740955ae
-    git -C u-boot cherry-pick caaeac88466f4152bd126e2342765a4b740955ae
-
-    # rockchip: rk3568: Use dwc3-generic driver
-    # https://github.com/u-boot/u-boot/commit/f8a2d1c108da37fd5202d717c3e428e3dfc12f01
-    git -C u-boot cherry-pick f8a2d1c108da37fd5202d717c3e428e3dfc12f01
-
-    # rockchip: rk356x: Sync dtsi from linux v6.4
-    # https://github.com/u-boot/u-boot/commit/0e3480c1f72f18f80690f8012404eacb67a61151
-    git -C u-boot cherry-pick 0e3480c1f72f18f80690f8012404eacb67a61151
-
-    # rockchip: rk356x-u-boot: Add bootph-all to common pinctrl nodes
-    # https://github.com/u-boot/u-boot/commit/a3ef37a08df3c6aa463ad794e1f788d8a24b129c
-    git -C u-boot cherry-pick a3ef37a08df3c6aa463ad794e1f788d8a24b129c
-
-    # rockchip: rk356x-u-boot: Use relaxed u-boot,spl-boot-order
-    # https://github.com/u-boot/u-boot/commit/f40dcc7d1e74ff5aa5f709918e26cb31277dcea0
-    git -C u-boot cherry-pick f40dcc7d1e74ff5aa5f709918e26cb31277dcea0
-
-    # rockchip: rk3568-rock-3a: Fix SPI Flash alias
-    # https://github.com/u-boot/u-boot/commit/52f6b96d27c8aabca697ac395e86a3481f1c53b7
-    git -C u-boot cherry-pick 52f6b96d27c8aabca697ac395e86a3481f1c53b7
-
-    # power: regulator: rk8xx: Add 500us delay after LDO regulator is enabled
-    # https://github.com/u-boot/u-boot/commit/fea7a29cc8d86a0bbcb4bcf740d47924839b1f81
-    git -C u-boot cherry-pick fea7a29cc8d86a0bbcb4bcf740d47924839b1f81
-
-    # bootflow: Export setup_fs()
-    # https://github.com/u-boot/u-boot/commit/0c0c82b5177e9afb3a248da4d004f3dc48975c91
-    git -C u-boot cherry-pick 0c0c82b5177e9afb3a248da4d004f3dc48975c91
-
-    # bootstd: Use a function to detect network in EFI bootmeth
-    # https://github.com/u-boot/u-boot/commit/146242cc998ed6e002831d4ff409189353e1960a
-    git -C u-boot cherry-pick 146242cc998ed6e002831d4ff409189353e1960a
-
-    # bootstd: Avoid allocating memory for the EFI file
-    # https://github.com/u-boot/u-boot/commit/6a8c2f9781cede2a7cb2b95ee6310cd53b1c20e2
-    git -C u-boot cherry-pick 6a8c2f9781cede2a7cb2b95ee6310cd53b1c20e2
-
-    # bootstd: Init the size before reading the devicetree
-    # https://github.com/u-boot/u-boot/commit/2984d21a28f812c9c1fd2243cc72796f69a61585
-    git -C u-boot cherry-pick 2984d21a28f812c9c1fd2243cc72796f69a61585
-
-    # bootstd: Init the size before reading extlinux file
-    # https://github.com/u-boot/u-boot/commit/11158aef8939bb6e54361e4dae3809a9cbe78cff
-    git -C u-boot cherry-pick 11158aef8939bb6e54361e4dae3809a9cbe78cff
+    # regulator: rk8xx: Return correct voltage for switchout converters
+    # https://github.com/u-boot/u-boot/commit/bb657ffdd688dc08073734a402914ec0a8492d53
+    git -C u-boot cherry-pick bb657ffdd688dc08073734a402914ec0a8492d53
 }
 
 cp_to_debian() {

diff --git a/uboot/patches/0001-ignore-build-artifacts.patch b/uboot/patches/0001-ignore-build-artifacts.patch
@@ -1,15 +1,15 @@
-From c79b03d7448b370fe2eb6a9c5fb67bc9505de728 Mon Sep 17 00:00:00 2001
+From 1ab1a698b18bb0da8ba71612db6497f418a55ce1 Mon Sep 17 00:00:00 2001
 From: John Clark <[email protected]>
 Date: Tue, 7 Mar 2023 01:47:26 +0000
-Subject: [PATCH 1/9] ignore build artifacts
+Subject: [PATCH] ignore build artifacts
 
 Signed-off-by: John Clark <[email protected]>
 ---
- .gitignore | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ .gitignore | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
-index 3a4d056edf..27b515736b 100644
+index 002f95de4f..47f06f14c7 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -35,7 +35,7 @@
@@ -21,14 +21,26 @@ index 3a4d056edf..27b515736b 100644
 
  #
  # Top-level generic files
-@@ -44,6 +44,7 @@ fit-dtb.blob*
+@@ -44,6 +44,9 @@ fit-dtb.blob*
  /MLO*
  /SPL*
  /System.map
++/mkimage-in-simple-bin*
 +/simple-bin*
++/tools/generated
  /u-boot*
  /boards.cfg
  /*.log
+@@ -65,7 +68,8 @@ fit-dtb.blob*
+ #
+ # Generated include files
+ #
+-/include/config/
++include/autoconf.mk*
++/include/config*
+ /include/generated/
+
+ # stgit generated dirs
 -- 
-2.40.1
+2.42.0
 
diff --git a/uboot/patches/0002-fixup-rockchip-rk3568-Add-support-for-FriendlyARM-Na.patch b/uboot/patches/0002-fixup-rockchip-rk3568-Add-support-for-FriendlyARM-Na.patch