use radxa base for mixtile u-boot

Joshua-Riek · Jul 18, 2023 · 9bf6e71 · 9bf6e71
1 parent 9aebaf8
commit 9bf6e71
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 116 deletions.
diff --git a/packages/u-boot-mixtile/debian/changelog b/packages/u-boot-mixtile/debian/changelog
@@ -1,4 +1,4 @@
-u-boot-mixtile-rk3588 (2017.09+20220517.git7182d4be-1) jammy; urgency=medium
+u-boot-mixtile-rk3588 (2017.09+20230711.gitddc91cd0-1) jammy; urgency=medium
 
   * Initial packaging.
 

diff --git a/...ebian/patches/2000-fix-srctree-path.patch → ...ebian/patches/1004-fix-srctree-path.patch b/...ebian/patches/2000-fix-srctree-path.patch → ...ebian/patches/1004-fix-srctree-path.patch
@@ -4,12 +4,25 @@ Date: Sun, 23 Apr 2023 10:26:00 -0400
 Subject: [PATCH] arch: arm: mach-rockchip: fix srctree path
 
 ---
- arch/arm/mach-rockchip/make_fit_atf.sh  | 2 +-
- arch/arm/mach-rockchip/make_fit_boot.sh | 2 +-
+ arch/arm/mach-rockchip/fit_nodes.sh    | 2 +-
+ arch/arm/mach-rockchip/make_fit_atf.sh | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh
+index be7d46d8f..c0afc1ade 100755
+--- a/arch/arm/mach-rockchip/fit_nodes.sh
++++ b/arch/arm/mach-rockchip/fit_nodes.sh
+@@ -6,7 +6,7 @@
+ #
+
+ # Process args and auto set variables
+-source ./${srctree}/arch/arm/mach-rockchip/fit_args.sh
++source ${srctree}/arch/arm/mach-rockchip/fit_args.sh
+ rm -f ${srctree}/*.digest ${srctree}/*.bin.gz ${srctree}/bl31_0x*.bin
+
+ # Periph register
 diff --git a/arch/arm/mach-rockchip/make_fit_atf.sh b/arch/arm/mach-rockchip/make_fit_atf.sh
-index 32ef33b8b0..2211562a6b 100755
+index 045273e3b..fa6a9780e 100755
 --- a/arch/arm/mach-rockchip/make_fit_atf.sh
 +++ b/arch/arm/mach-rockchip/make_fit_atf.sh
 @@ -5,7 +5,7 @@
@@ -21,18 +34,6 @@ index 32ef33b8b0..2211562a6b 100755
 
  gen_header
  gen_uboot_node
-diff --git a/arch/arm/mach-rockchip/make_fit_boot.sh b/arch/arm/mach-rockchip/make_fit_boot.sh
-index 312aa996e6..76591bf2de 100755
---- a/arch/arm/mach-rockchip/make_fit_boot.sh
-+++ b/arch/arm/mach-rockchip/make_fit_boot.sh
-@@ -6,7 +6,7 @@
- #
-
- # Process args and auto set variables
--source ./${srctree}/arch/arm/mach-rockchip/fit_args.sh
-+source ${srctree}/arch/arm/mach-rockchip/fit_args.sh
-
- if [ ! -f ${srctree}/images/ramdisk ]; then
- 	touch ${srctree}/images/ramdisk
 -- 
 2.25.1
+
diff --git a/packages/u-boot-mixtile/debian/patches/1004-rockchip-disable-gen_bl32_node.patch b/packages/u-boot-mixtile/debian/patches/1004-rockchip-disable-gen_bl32_node.patch
diff --git a/...ot-mixtile/debian/patches/1006-rockchip-allow-passing-of-BL31-location-via-variable.patch b/...ot-mixtile/debian/patches/1006-rockchip-allow-passing-of-BL31-location-via-variable.patch
diff --git a/packages/u-boot-mixtile/debian/patches/series b/packages/u-boot-mixtile/debian/patches/series
@@ -2,8 +2,6 @@
 1001-Fixed-restart-issues-with-pd-adapter.patch
 1002-fix-power_delivery-driver-affects-adb-to-enter-loade.patch
 1003-cmd-source-fix-the-error-that-the-command-source-fai.patch
-1004-rockchip-disable-gen_bl32_node.patch
+1004-fix-srctree-path.patch
 1005-enable-otp-in-defconfig.patch
-1006-rockchip-allow-passing-of-BL31-location-via-variable.patch
 1099-disable-optee-in-defconfig.patch
-2000-fix-srctree-path.patch
diff --git a/packages/u-boot-mixtile/debian/source/include-binaries b/packages/u-boot-mixtile/debian/source/include-binaries
@@ -1,2 +1,2 @@
-debian/rkbin/rk3588_bl31_v1.34.elf
-debian/rkbin/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.09.bin
+debian/rkbin/rk3588_bl31_v1.38.elf
+debian/rkbin/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin
diff --git a/packages/u-boot-mixtile/debian/upstream b/packages/u-boot-mixtile/debian/upstream
@@ -1,4 +1,4 @@
 GIT=https://github.com/radxa/u-boot.git
-COMMIT=7182d4beae2dab4bbd39bd59c1fbb2230f0051d4
+COMMIT=ddc91cd08c10f625f7a7c93033042aa4071c78a8
 BRANCH=next-dev
-VERSION=2017.09+20220517.git7182d4be
+VERSION=2017.09+20230711.gitddc91cd0