From 7a1ed5a1a42f98f3015112af653f3a2dbfb3f819 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 29 Sep 2023 15:58:30 +0200
Subject: u-boot: update to 2023.07.02

---
 package/u-boot/Makefile                                      |  9 +++++++--
 .../u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig  | 12 ++++++------
 .../u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig | 12 ++++++------
 package/u-boot/patches/patch-tools_Makefile                  |  6 +++---
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 2498c9310..18aa3242d 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		u-boot
-PKG_VERSION:=		2023.01
+PKG_VERSION:=		2023.07.02
 PKG_RELEASE:=		1
-PKG_HASH:=		69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f
+PKG_HASH:=		6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 HOST_BUILDDEP:=		libressl-host dtc-host
@@ -94,6 +94,10 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+ifeq ($(ADK_TARGET_BINFMT_FDPIC),y)
+EXTRA_CFLAGS:=		-mno-fdpic
+endif
+
 host-build:
 	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
 		$(HOST_MAKE_FLAGS) sandbox_defconfig )
@@ -110,6 +114,7 @@ do-configure:
 do-build:
 	(cd $(WRKBUILD) && env \
 		KBUILD_VERBOSE=1 \
+		KCFLAGS='$(EXTRA_CFLAGS)' \
 		PATH='$(HOST_PATH)' \
 		CROSS_COMPILE='$(TARGET_CROSS)' \
 		$(MAKE))
diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
index 93307dc60..818529353 100644
--- a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
+++ b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
@@ -1,11 +1,11 @@
---- u-boot-2022.10.orig/configs/rock-pi-4-rk3399_defconfig	2022-10-03 21:25:32.000000000 +0200
-+++ u-boot-2022.10/configs/rock-pi-4-rk3399_defconfig	2022-12-25 08:01:46.267056624 +0100
-@@ -60,7 +62,7 @@ CONFIG_REGULATOR_RK8XX=y
+--- u-boot-2023.07.02.orig/configs/rock-pi-4-rk3399_defconfig	2023-07-11 17:20:44.000000000 +0200
++++ u-boot-2023.07.02/configs/rock-pi-4-rk3399_defconfig	2023-09-29 15:54:05.235780393 +0200
+@@ -70,7 +70,7 @@ CONFIG_REGULATOR_PWM=y
+ CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
- CONFIG_RAM_RK3399_LPDDR4=y
- CONFIG_DM_RESET=y
+ CONFIG_RAM_ROCKCHIP_LPDDR4=y
 -CONFIG_BAUDRATE=1500000
 +CONFIG_BAUDRATE=115200
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
- CONFIG_USB=y
diff --git a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig
index 6aa6a9358..87e4bd238 100644
--- a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig
+++ b/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig
@@ -1,11 +1,11 @@
---- u-boot-2022.10.orig/configs/rock-pi-4c-rk3399_defconfig	2022-10-03 21:25:32.000000000 +0200
-+++ u-boot-2022.10/configs/rock-pi-4c-rk3399_defconfig	2022-12-06 13:45:16.410352759 +0100
-@@ -60,7 +60,7 @@ CONFIG_REGULATOR_RK8XX=y
+--- u-boot-2023.07.02.orig/configs/rock-pi-4c-rk3399_defconfig	2023-07-11 17:20:44.000000000 +0200
++++ u-boot-2023.07.02/configs/rock-pi-4c-rk3399_defconfig	2023-09-29 15:54:16.927583546 +0200
+@@ -67,7 +67,7 @@ CONFIG_REGULATOR_PWM=y
+ CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
- CONFIG_RAM_RK3399_LPDDR4=y
- CONFIG_DM_RESET=y
+ CONFIG_RAM_ROCKCHIP_LPDDR4=y
 -CONFIG_BAUDRATE=1500000
 +CONFIG_BAUDRATE=115200
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
- CONFIG_USB=y
diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile
index 505ea209a..c94bd2ada 100644
--- a/package/u-boot/patches/patch-tools_Makefile
+++ b/package/u-boot/patches/patch-tools_Makefile
@@ -1,6 +1,6 @@
---- u-boot-2022.10.orig/tools/Makefile	2022-10-03 21:25:32.000000000 +0200
-+++ u-boot-2022.10/tools/Makefile	2023-01-26 10:01:05.399923828 +0100
-@@ -174,9 +174,9 @@ endif
+--- u-boot-2023.07.02.orig/tools/Makefile	2023-07-11 17:20:44.000000000 +0200
++++ u-boot-2023.07.02/tools/Makefile	2023-09-29 15:53:47.464079598 +0200
+@@ -172,9 +172,9 @@ endif
  # MXSImage needs LibSSL
  ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),)
  HOSTCFLAGS_kwbimage.o += \
-- 
cgit v1.2.3