diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile index ecf0237ed0..91a9a98361 100644 --- a/package/boot/arm-trusted-firmware-rockchip/Makefile +++ b/package/boot/arm-trusted-firmware-rockchip/Makefile @@ -27,21 +27,21 @@ endef define Trusted-Firmware-A/rk3328 BUILD_SUBTARGET:=armv8 ATF:=rk33/$(RK3328_ATF) - DDR:=rk33/$(RK3328_DDR) + TPL:=rk33/$(RK3328_TPL) LOADER:=rk33/$(RK3328_LOADER) endef define Trusted-Firmware-A/rk3399 BUILD_SUBTARGET:=armv8 ATF:=rk33/$(RK3399_ATF) - DDR:=rk33/$(RK3399_DDR) + TPL:=rk33/$(RK3399_TPL) LOADER:=rk33/$(RK3399_LOADER) endef define Trusted-Firmware-A/rk3568 BUILD_SUBTARGET:=armv8 ATF:=rk35/$(RK3568_ATF) - DDR:=rk35/$(RK3568_DDR) + TPL:=rk35/$(RK3568_TPL) endef TFA_TARGETS:= \ @@ -56,7 +56,7 @@ ifneq ($(LOADER),) pushd $(PKG_BUILD_DIR) ; \ $(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' trust.ini ; \ $(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' trust.ini ; \ - ./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(DDR) \ + ./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(TPL) \ $(BUILD_VARIANT)-idbloader.bin ; \ cat bin/$(LOADER) >> $(BUILD_VARIANT)-idbloader.bin ; \ ./tools/trust_merger --replace bl31.elf bin/$(ATF) trust.ini ; \ @@ -74,7 +74,7 @@ ifneq ($(LOADER),) $(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-idbloader.bin $(STAGING_DIR_IMAGE)/ $(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-trust.bin $(STAGING_DIR_IMAGE)/ else - $(CP) $(PKG_BUILD_DIR)/bin/$(DDR) $(STAGING_DIR_IMAGE)/ + $(CP) $(PKG_BUILD_DIR)/bin/$(TPL) $(STAGING_DIR_IMAGE)/ endif endef diff --git a/package/boot/arm-trusted-firmware-rockchip/atf-version.mk b/package/boot/arm-trusted-firmware-rockchip/atf-version.mk index 6a081456bb..e03ee08ed4 100644 --- a/package/boot/arm-trusted-firmware-rockchip/atf-version.mk +++ b/package/boot/arm-trusted-firmware-rockchip/atf-version.mk @@ -1,13 +1,13 @@ RK3328_ATF:=rk322xh_bl31_v1.49.elf -RK3328_DDR:=rk3328_ddr_333MHz_v1.19.bin +RK3328_TPL:=rk3328_ddr_333MHz_v1.19.bin RK3328_LOADER:=rk322xh_miniloader_v2.50.bin RK3399_ATF:=rk3399_bl31_v1.36.elf -RK3399_DDR:=rk3399_ddr_800MHz_v1.30.bin +RK3399_TPL:=rk3399_ddr_800MHz_v1.30.bin RK3399_LOADER:=rk3399_miniloader_v1.30.bin RK3568_ATF:=rk3568_bl31_v1.43.elf -RK3568_DDR:=rk3568_ddr_1560MHz_v1.18.bin +RK3568_TPL:=rk3568_ddr_1560MHz_v1.18.bin RK3588_ATF:=rk3588_bl31_v1.41.elf -RK3588_DDR:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.13.bin +RK3588_TPL:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.13.bin diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index ea7700c944..63497ccaf3 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -146,7 +146,7 @@ define U-Boot/Default/rk3568 BUILD_SUBTARGET:=armv8 DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568 ATF:=$(RK3568_ATF) - DDR:=$(RK3568_DDR) + TPL:=$(RK3568_TPL) endef define U-Boot/fastrhino-r66s-rk3568 @@ -223,11 +223,11 @@ UBOOT_CUSTOMIZE_CONFIG := \ UBOOT_MAKE_FLAGS += \ PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \ BL31=$(STAGING_DIR_IMAGE)/$(ATF) \ - $(if $(DDR),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)) + $(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL)) define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) -ifneq ($(DDR),) +ifneq ($(TPL),) $(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 else