refresh uboot from openwrt master

Author: anaelorlinski

README.md

@@ -19,6 +19,8 @@ Those are my customized builds of OpenWrt for FriendlyARM NanoPi R2S / R4S
 
 ## Changelog
 
+### 2021-10-11
+- Refresh uboot
 #### 2021-07-07
 - Fix issue #3 with strangri_repo : thanks TheLinuxGuy for reporting
 - Fix issue #4 with dnsmasq misconfigured : thanks semicuda for reporting

local-scripts/data/uboot/Makefile

@@ -9,14 +9,10 @@ fi
 BUILDDIR="$ROOTDIR/build"
 SCRIPTDIR=$(dirname $(readlink -f $0))
 
-if [ ! -e "$BUILDDIR/immortal-fresh-master" ]; then
-    echo "Please run from root / no immortal-fresh-master ! please clone first"
+if [ ! -e "$BUILDDIR/openwrt-fresh-master" ]; then
+    echo "Please run from root / no openwrt-fresh-master ! please clone first"
     exit 1
 fi
 
 rm -rf $ROOTDIR/package/uboot-rockchip
-cp -R $BUILDDIR/immortal-fresh-master/package/boot/uboot-rockchip $ROOTDIR/package/uboot-rockchip
-
-# use custom makefile, so there is no need of arm-trusted-firmware-rk3288
-# and use generic version arm-trusted-firmware-rockchip
-cp $SCRIPTDIR/data/uboot/Makefile $ROOTDIR/package/uboot-rockchip/Makefile
+cp -R $BUILDDIR/openwrt-fresh-master/package/boot/uboot-rockchip $ROOTDIR/package/uboot-rockchip

local-scripts/refresh_uboot.sh

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2021.04
-PKG_RELEASE:=1
+PKG_VERSION:=2021.07
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_HASH:=0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a
+PKG_HASH:=312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
 
 PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
 
@@ -52,7 +52,7 @@ define U-Boot/rock-pi-4-rk3399
   BUILD_SUBTARGET:=armv8
   NAME:=Rock Pi 4
   BUILD_DEVICES:= \
-    radxa_rock-pi-4
+    radxa_rock-pi-4a
   DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
   ATF:=rk3399_bl31.elf
@@ -88,6 +88,7 @@ ifneq ($(OF_PLATDATA),)
 
 	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-plat.c $(PKG_BUILD_DIR)/tpl/dts/dt-plat.c
 	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h
+	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-decl.h $(PKG_BUILD_DIR)/include/generated/dt-decl.h
 endif
 
 	$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config

package/uboot-rockchip/Makefile

@@ -17,14 +17,12 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/scripts/Makefile.spl
 +++ b/scripts/Makefile.spl
-@@ -329,10 +329,6 @@ PHONY += dts_dir
- dts_dir:
- 	$(shell [ -d $(obj)/dts ] || mkdir -p $(obj)/dts)
- 
--include/generated/dt-structs-gen.h $(u-boot-spl-platdata_c) &: \
--		$(obj)/$(SPL_BIN).dtb dts_dir FORCE
+@@ -354,8 +354,6 @@ $(platdata-hdr) $(u-boot-spl-platdata_c)
+ 	@# of OF_PLATDATA_INST and this might change between builds. Leaving old
+ 	@# ones around is confusing and it is possible that switching the
+ 	@# setting again will use the old one instead of regenerating it.
+-	@rm -f $(u-boot-spl-all-platdata_c) $(u-boot-spl-all-platdata)
 -	$(call if_changed,dtoc)
--
+ 
  ifdef CONFIG_SAMSUNG
  ifdef CONFIG_VAR_SIZE_SPL
- VAR_SIZE_PARAM = --vs