From ffad2f5a30b18ce35494fefac88e05cab423cbed Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 8 Aug 2021 16:22:14 +0800 Subject: [PATCH] uboot-rockchip: use rkbin for nanopi r4s Signed-off-by: Tianling Shen (cherry picked from commit a2759b1be2387d357dc08203025d6889b4ab1292) --- package/boot/uboot-rockchip/Makefile | 7 ++++--- target/linux/rockchip/image/armv8.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index bdc6cb2118..d6d7464aef 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -56,9 +56,10 @@ define U-Boot/nanopi-r4s-rk3399 NAME:=NanoPi R4S BUILD_DEVICES:= \ friendlyarm_nanopi-r4s - DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rockchip - PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip - ATF:=rk3399_bl31.elf + DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rk3399 + PKG_BUILD_DEPENDS:=arm-trusted-firmware-rkbin + ATF:=rk3399_bl31_v1.35.elf + USE_RKBIN:=1 endef define U-Boot/rock-pi-4-rk3399 diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 43b44c80d2..c16cc41a92 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -17,7 +17,7 @@ define Device/friendlyarm_nanopi-r4s DEVICE_MODEL := NanoPi R4S SOC := rk3399 UBOOT_DEVICE_NAME := nanopi-r4s-rk3399 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-r8169 -urngd endef TARGET_DEVICES += friendlyarm_nanopi-r4s