From 4262a83d1d0316f45fdcc66595b8fc37fbf875db Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 12 Aug 2021 23:51:19 +0800
Subject: [PATCH] arm-trusted-firmware-rockchip-vendor: rework multiple devices
 building

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 .../Makefile                                  | 24 +++++++++----------
 .../src/trust.ini                             |  2 +-
 package/boot/uboot-rockchip/Makefile          |  2 --
 target/linux/rockchip/image/Makefile          |  4 ++--
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
index 26a140911c..0af16c4d7e 100644
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
+++ b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
@@ -23,46 +23,44 @@ define Package/arm-trusted-firmware-rockchip-vendor
     SECTION:=boot
     CATEGORY:=Boot Loaders
     TITLE:=ARM Trusted Firmware for Rockchip
-    DEPENDS:=@TARGET_rockchip_armv8
 endef
 
 define Package/arm-trusted-firmware-rk3328
     $(Package/arm-trusted-firmware-rockchip-vendor)
-ifneq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3328),)
-    SOC:=rk3328
+    DEPENDS:=@TARGET_rockchip_armv8
+    VARIANT:=rk3328
     ATF:=rk33/rk322xh_bl31_v1.46.elf
     DDR:=rk33/rk3328_ddr_333MHz_v1.17.bin
     LOADER:=rk33/rk322xh_miniloader_v2.50.bin
-endif
 endef
 
 define Package/arm-trusted-firmware-rk3399
     $(Package/arm-trusted-firmware-rockchip-vendor)
-ifneq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3399),)
-    SOC:=rk3399
+    DEPENDS:=@TARGET_rockchip_armv8
+    VARIANT:=rk3399
     ATF:=rk33/rk3399_bl31_v1.35.elf
     DDR:=rk33/rk3399_ddr_800MHz_v1.25.bin
     LOADER:=rk33/rk3399_miniloader_v1.26.bin
-endif
 endef
 
 define Build/Configure
 	$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' $(PKG_BUILD_DIR)/trust.ini
+	$(SED) 's,$$$$(VARIANT),$(VARIANT),g' $(PKG_BUILD_DIR)/trust.ini
 	$(call Build/Configure/Default)
 endef
 
 define Build/Compile
-	mkimage -n $$(SOC) -T rksd -d $(PKG_BUILD_DIR)/bin/$$(DDR) $(PKG_BUILD_DIR)/idbloader.bin
-	cat $(PKG_BUILD_DIR)/bin/$$(LOADER) >> $(PKG_BUILD_DIR)/idbloader.bin
-	$(PKG_BUILD_DIR)/tools/trust_merger --replace bl31.elf $(PKG_BUILD_DIR)/bin/$$(ATF) $(PKG_BUILD_DIR)/trust.ini
+	mkimage -n $(VARIANT) -T rksd -d $(PKG_BUILD_DIR)/bin/$(DDR) $(PKG_BUILD_DIR)/$(VARIANT)-idbloader.bin
+	cat $(PKG_BUILD_DIR)/bin/$(LOADER) >> $(PKG_BUILD_DIR)/$(VARIANT)-idbloader.bin
+	$(PKG_BUILD_DIR)/tools/trust_merger --replace bl31.elf $(PKG_BUILD_DIR)/bin/$(ATF) $(PKG_BUILD_DIR)/trust.ini
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) -p $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/bin/$$(ATF) $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/
 	$(CP) $(PKG_BUILD_DIR)/tools/loaderimage $(STAGING_DIR_IMAGE)/
-	$(CP) $(PKG_BUILD_DIR)/idbloader.bin $(STAGING_DIR_IMAGE)/
-	$(CP) $(PKG_BUILD_DIR)/trust.bin $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/$(VARIANT)-idbloader.bin $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/$(VARIANT)-trust.bin $(STAGING_DIR_IMAGE)/
 endef
 
 define Package/arm-trusted-firmware-rk3328/install
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini b/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
index b95797427e..17b0177b7e 100644
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
+++ b/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
@@ -12,4 +12,4 @@ SEC=0
 [BL33_OPTION]
 SEC=0
 [OUTPUT]
-PATH=$(PKG_BUILD_DIR)/trust.bin
+PATH=$(PKG_BUILD_DIR)/$(VARIANT)-trust.bin
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index 3fd64176aa..ce33b36aa3 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -114,8 +114,6 @@ define Build/InstallDev
 ifneq ($(USE_RKBIN),)
 	$(STAGING_DIR_IMAGE)/loaderimage --pack --uboot $(PKG_BUILD_DIR)/u-boot-dtb.bin $(PKG_BUILD_DIR)/uboot.img 0x200000
 	$(CP) $(PKG_BUILD_DIR)/uboot.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.img
-	$(CP) $(STAGING_DIR_IMAGE)/idbloader.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.bin
-	$(CP) $(STAGING_DIR_IMAGE)/trust.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-trust.bin
 else
 	$(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
diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index 5791f5c064..79e628ca56 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -60,9 +60,9 @@ define Build/pine64-bin
 		32768
 
 	# Copy the idbloader, uboot and trust image to the image at sector 0x40, 0x4000 and 0x6000
-	dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-idbloader.bin of="$@" seek=64 conv=notrunc
+	dd if="$(STAGING_DIR_IMAGE)"/$(SOC)-idbloader.bin of="$@" seek=64 conv=notrunc
 	dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-uboot.img of="$@" seek=16384 conv=notrunc
-	dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-trust.bin of="$@" seek=24576 conv=notrunc
+	dd if="$(STAGING_DIR_IMAGE)"/$(SOC)-trust.bin of="$@" seek=24576 conv=notrunc
 endef
 
 ### Devices ###