Skip to content

Commit

Permalink
uboot-rockchip: bump to 2025.01
Browse files Browse the repository at this point in the history
Removed upstreamed patches.

Signed-off-by: Tianling Shen <[email protected]>
  • Loading branch information
1715173329 committed Jan 8, 2025
1 parent 8607c28 commit d34697c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 208 deletions.
4 changes: 2 additions & 2 deletions package/boot/uboot-rockchip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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:=Sarah Maedel <[email protected]>

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: Chris Morgan <[email protected]>

obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o

-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
-ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),)
-
# Always include boot_mode.o, as we bypass it (i.e. turn it off)
# inside of boot_mode.c when CONFIG_ROCKCHIP_BOOT_MODE_REG is 0. This way,
Expand Down Expand Up @@ -101,7 +101,7 @@ Signed-off-by: Chris Morgan <[email protected]>
#include <asm/arch-rockchip/grf_rk3568.h>
#include <asm/arch-rockchip/hardware.h>
#include <dt-bindings/clock/rk3568-cru.h>
@@ -133,3 +134,26 @@ int arch_cpu_init(void)
@@ -139,3 +140,26 @@ int arch_cpu_init(void)
#endif
return 0;
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -50,3 +50,4 @@ obj-$(CONFIG_WDT_STM32MP) += stm32mp_wdt
@@ -52,3 +52,4 @@ obj-$(CONFIG_WDT_STM32MP) += stm32mp_wdt
obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o
obj-$(CONFIG_WDT_TANGIER) += tangier_wdt.o
obj-$(CONFIG_WDT_XILINX) += xilinx_wwdt.o
+obj-$(CONFIG_WDT_PCAT) += pcat_wdt.o
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -421,4 +421,10 @@ config WDT_FTWDT010
@@ -443,4 +443,10 @@ config WDT_FTWDT010
help
Faraday Technology ftwdt010 watchdog is an architecture independent
watchdog. It is usually used in SoC chip design.
Expand Down

0 comments on commit d34697c

Please sign in to comment.