uboot-rockchip: bump to 2025.01

coolsnowwolf · Jan 15, 2025 · 90de065 · 90de065
1 parent d2bbf8b
commit 90de065
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 431 deletions.
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2024.10
+PKG_VERSION:=2025.01
 PKG_RELEASE:=1
 
-PKG_HASH:=b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
+PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 
 PKG_MAINTAINER:=Tobias Maedel <[email protected]>
 

diff --git a/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch b/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -2052,26 +2052,7 @@ endif
+@@ -2072,26 +2072,7 @@ endif
  # Check dtc and pylibfdt, if DTC is provided, else build them
  PHONY += scripts_dtc
  scripts_dtc: scripts_basic

diff --git a/package/boot/uboot-rockchip/patches/200-radxa-e25-update-baudrate.patch b/package/boot/uboot-rockchip/patches/200-radxa-e25-update-baudrate.patch
@@ -1,6 +1,6 @@
 --- a/configs/radxa-e25-rk3568_defconfig
 +++ b/configs/radxa-e25-rk3568_defconfig
-@@ -62,6 +62,7 @@ CONFIG_REGULATOR_RK8XX=y
+@@ -64,6 +64,7 @@ CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_SPL_RAM=y
  CONFIG_SCSI=y

diff --git a/package/boot/uboot-rockchip/patches/201-rk3568-generic-remove-spi-support.patch b/package/boot/uboot-rockchip/patches/201-rk3568-generic-remove-spi-support.patch
@@ -34,20 +34,22 @@
  };
 --- a/configs/generic-rk3568_defconfig
 +++ b/configs/generic-rk3568_defconfig
-@@ -5,12 +5,9 @@ CONFIG_ARCH_ROCKCHIP=y
+@@ -5,14 +5,10 @@ CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SF_DEFAULT_SPEED=24000000
  CONFIG_DEFAULT_DEVICE_TREE="rk3568-generic"
  CONFIG_ROCKCHIP_RK3568=y
 -CONFIG_ROCKCHIP_SPI_IMAGE=y
  CONFIG_SPL_SERIAL=y
+ CONFIG_SYS_LOAD_ADDR=0xc00800
+-CONFIG_SF_DEFAULT_BUS=4
  CONFIG_DEBUG_UART_BASE=0xFE660000
  CONFIG_DEBUG_UART_CLOCK=24000000
 -CONFIG_SPL_SPI_FLASH_SUPPORT=y
 -CONFIG_SPL_SPI=y
- CONFIG_SYS_LOAD_ADDR=0xc00800
  CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
-@@ -25,8 +22,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ CONFIG_FIT_VERBOSE=y
+@@ -25,8 +21,6 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568
  CONFIG_SPL_MAX_SIZE=0x40000
  CONFIG_SPL_PAD_TO=0x7f8000
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -56,11 +58,10 @@
  CONFIG_SPL_ATF=y
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_GPT=y
-@@ -56,21 +51,12 @@ CONFIG_MMC_DW_ROCKCHIP=y
+@@ -57,20 +51,12 @@ CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_SDMA=y
  CONFIG_MMC_SDHCI_ROCKCHIP=y
--CONFIG_SF_DEFAULT_BUS=4
 -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 -CONFIG_SPI_FLASH_GIGADEVICE=y
 -CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/...age/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-FriendlyARM-NanoPi-R2S-Plus.patch b/...age/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-FriendlyARM-NanoPi-R2S-Plus.patch