include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
-PKG_VERSION:=2024.01
+PKG_VERSION:=2024.07
PKG_RELEASE:=1
-PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
+PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
-PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
+PKG_MAINTAINER:=Sarah Maedel <openwrt@tbspace.de>
UBOOT_USE_BINMAN:=1
UBOOT_USE_INTREE_DTC:=1
endef
+# RK3308 boards
+
+define U-Boot/rk3308/Default
+ BUILD_SUBTARGET:=armv8
+ DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308
+ ATF:=rk3308_bl31_v2.26.elf
+ TPL:=rk3308_ddr_589MHz_uart2_m1_v2.07.bin
+endef
+
+define U-Boot/rock-pi-s-rk3308
+ $(U-Boot/rk3308/Default)
+ DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308-rock-pi-s
+ TPL:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+ NAME:=ROCK Pi S
+ BUILD_DEVICES:= \
+ radxa_rock-pi-s
+endef
+
# RK3328 boards
define U-Boot/rk3328/Default
radxa_rock-pi-e
endef
+define U-Boot/rock-pi-e-v3-rk3328
+ $(U-Boot/rk3328/Default)
+ NAME:=ROCK Pi E v3.0
+ BUILD_DEVICES:= \
+ radxa_rock-pi-e-v3
+endef
+
# RK3399 boards
define U-Boot/rk3399/Default
$(U-Boot/rk3399/Default)
NAME:=NanoPi R4S
BUILD_DEVICES:= \
- friendlyarm_nanopi-r4s
+ friendlyarm_nanopi-r4s \
+ friendlyarm_nanopi-r4s-enterprise
endef
define U-Boot/rock-pi-4-rk3399
endef
+# RK3566 boards
+
+define U-Boot/rk3566/Default
+ BUILD_SUBTARGET:=armv8
+ DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3566
+ ATF:=rk3568_bl31_v1.44.elf
+ TPL:=rk3566_ddr_1056MHz_v1.21.bin
+endef
+
+define U-Boot/radxa-cm3-io-rk3566
+ $(U-Boot/rk3566/Default)
+ NAME:=CM3 IO
+ BUILD_DEVICES:= \
+ radxa_cm3-io
+endef
+
+define U-Boot/radxa-zero-3-rk3566
+ $(U-Boot/rk3566/Default)
+ NAME:=ZERO 3E/3W
+ BUILD_DEVICES:= \
+ radxa_zero-3e \
+ radxa_zero-3w
+endef
+
+define U-Boot/rock-3c-rk3566
+ $(U-Boot/rk3566/Default)
+ NAME:=ROCK 3C
+ BUILD_DEVICES:= \
+ radxa_rock-3c
+endef
+
# RK3568 boards
define U-Boot/rk3568/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568
- ATF:=rk3568_bl31_v1.43.elf
- TPL:=rk3568_ddr_1560MHz_v1.18.bin
+ ATF:=rk3568_bl31_v1.44.elf
+ TPL:=rk3568_ddr_1560MHz_v1.21.bin
+endef
+
+define U-Boot/bpi-r2-pro-rk3568
+ $(U-Boot/rk3568/Default)
+ NAME:=Bananapi-R2 Pro
+ BUILD_DEVICES:= \
+ sinovoip_bpi-r2-pro
endef
define U-Boot/nanopi-r5c-rk3568
friendlyarm_nanopi-r5s
endef
+define U-Boot/radxa-e25-rk3568
+ $(U-Boot/rk3568/Default)
+ DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568-e25
+ TPL:=rk3568_ddr_1560MHz_uart2_m0_115200_v1.21.bin
+ NAME:=E25
+ BUILD_DEVICES:= \
+ radxa_e25
+endef
+
+define U-Boot/rock-3a-rk3568
+ $(U-Boot/rk3568/Default)
+ NAME:=ROCK 3A
+ BUILD_DEVICES:= \
+ radxa_rock-3a
+endef
+
+define U-Boot/rock-3b-rk3568
+ $(U-Boot/rk3568/Default)
+ NAME:=ROCK 3B
+ BUILD_DEVICES:= \
+ radxa_rock-3b
+endef
+
+
+# RK3588 boards
+
+define U-Boot/rk3588/Default
+ BUILD_SUBTARGET:=armv8
+ DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3588
+ ATF:=rk3588_bl31_v1.45.elf
+ TPL:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin
+endef
+
+define U-Boot/nanopc-t6-rk3588
+ $(U-Boot/rk3588/Default)
+ NAME:=NanoPC T6
+ BUILD_DEVICES:= \
+ friendlyarm_nanopc-t6
+endef
+
+define U-Boot/rock5b-rk3588
+ $(U-Boot/rk3588/Default)
+ NAME:=ROCK 5B
+ BUILD_DEVICES:= \
+ radxa_rock-5b
+endef
+
+define U-Boot/sige7-rk3588
+ $(U-Boot/rk3588/Default)
+ NAME:=Sige7
+ BUILD_DEVICES:= \
+ armsom_sige7
+endef
+
+
+# RK3588S boards
+
+define U-Boot/nanopi-r6c-rk3588s
+ $(U-Boot/rk3588/Default)
+ NAME:=NanoPi R6C
+ BUILD_DEVICES:= \
+ friendlyarm_nanopi-r6c
+endef
+
+define U-Boot/nanopi-r6s-rk3588s
+ $(U-Boot/rk3588/Default)
+ NAME:=NanoPi R6S
+ BUILD_DEVICES:= \
+ friendlyarm_nanopi-r6s
+endef
+
+define U-Boot/rock5a-rk3588s
+ $(U-Boot/rk3588/Default)
+ NAME:=ROCK 5A
+ BUILD_DEVICES:= \
+ radxa_rock-5a
+endef
+
UBOOT_TARGETS := \
nanopc-t4-rk3399 \
nanopi-r4s-rk3399 \
rock-pi-4-rk3399 \
rockpro64-rk3399 \
+ rock-pi-s-rk3308 \
nanopi-r2c-rk3328 \
nanopi-r2c-plus-rk3328 \
nanopi-r2s-rk3328 \
roc-cc-rk3328 \
rock64-rk3328 \
rock-pi-e-rk3328 \
+ rock-pi-e-v3-rk3328 \
+ radxa-cm3-io-rk3566 \
+ radxa-zero-3-rk3566 \
+ rock-3c-rk3566 \
+ bpi-r2-pro-rk3568 \
nanopi-r5c-rk3568 \
- nanopi-r5s-rk3568
+ nanopi-r5s-rk3568 \
+ radxa-e25-rk3568 \
+ rock-3a-rk3568 \
+ rock-3b-rk3568 \
+ nanopc-t6-rk3588 \
+ rock5b-rk3588 \
+ sige7-rk3588 \
+ nanopi-r6c-rk3588s \
+ nanopi-r6s-rk3588s \
+ rock5a-rk3588s
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
UBOOT_CUSTOMIZE_CONFIG := \
- --disable SPL_FIT_SIGNATURE \
--disable TOOLS_MKEFICAPSULE \
--set-str MKIMAGE_DTC_PATH $(PKG_BUILD_DIR)/scripts/dtc/dtc
UBOOT_MAKE_FLAGS += \
- PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
BL31=$(STAGING_DIR_IMAGE)/$(ATF) \
$(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL))
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
- $(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
- $(CP) $(PKG_BUILD_DIR)/u-boot.itb $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb
+ $(CP) $(PKG_BUILD_DIR)/u-boot-rockchip.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot-rockchip.bin
endef
define Package/u-boot/install/default