From 4dbccc141ee052a2a1c71353169145e2bb53b57d Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Mon, 13 Apr 2020 10:18:10 +0800
Subject: [PATCH] rockchip: its: add image name property

Used by scripts/fit-unpack.sh

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idbe18ce7737d6df8d145393cd081adb2642106fb
---
 arch/arm/mach-rockchip/kernel_arm.its    | 4 ++++
 arch/arm/mach-rockchip/kernel_arm64.its  | 5 ++++-
 arch/arm/mach-rockchip/make_fit_optee.sh | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/kernel_arm.its b/arch/arm/mach-rockchip/kernel_arm.its
index fb5f1ebb25..871f90d42b 100644
--- a/arch/arm/mach-rockchip/kernel_arm.its
+++ b/arch/arm/mach-rockchip/kernel_arm.its
@@ -14,6 +14,7 @@
 	images {
 		fdt@1 {
 			description = "Device tree blob for arm";
+			image = "rk-kernel.dtb";
 			data = /incbin/("images/rk-kernel.dtb");
 			type = "flat_dt";
 			arch = "arm";
@@ -26,6 +27,7 @@
 
 		kernel@1 {
 			description = "Kernel for arm";
+			image = "kernel.img";
 			data = /incbin/("images/kernel.img");
 			type = "kernel";
 			arch = "arm";
@@ -40,6 +42,7 @@
 
 		ramdisk@1 {
 			description = "Ramdisk for arm";
+			image = "ramdisk.img";
 			data = /incbin/("images/ramdisk.img");
 			type = "ramdisk";
 			arch = "arm";
@@ -53,6 +56,7 @@
 
 		resource@1 {
 			description = "Resource for arm";
+			image = "resource.img";
 			data = /incbin/("images/resource.img");
 			type = "multi";
 			arch = "arm";
diff --git a/arch/arm/mach-rockchip/kernel_arm64.its b/arch/arm/mach-rockchip/kernel_arm64.its
index 61ff1e5481..226e35b567 100644
--- a/arch/arm/mach-rockchip/kernel_arm64.its
+++ b/arch/arm/mach-rockchip/kernel_arm64.its
@@ -14,6 +14,7 @@
 	images {
 		fdt@1 {
 			description = "Device tree blob for arm64";
+			image = "rk-kernel.dtb";
 			data = /incbin/("images/rk-kernel.dtb");
 			type = "flat_dt";
 			arch = "arm64";
@@ -26,7 +27,7 @@
 
 		kernel@1 {
 			description = "Kernel for arm64";
-			kernel-version = <1>;
+			image = "kernel.img";
 			data = /incbin/("images/kernel.img");
 			type = "kernel";
 			arch = "arm64";
@@ -41,6 +42,7 @@
 
 		ramdisk@1 {
 			description = "Ramdisk for arm64";
+			image = "ramdisk.img";
 			data = /incbin/("images/ramdisk.img");
 			type = "ramdisk";
 			arch = "arm64";
@@ -54,6 +56,7 @@
 
 		resource@1 {
 			description = "Resource for arm64";
+			image = "resource.img";
 			data = /incbin/("images/resource.img");
 			type = "multi";
 			arch = "arm64";
diff --git a/arch/arm/mach-rockchip/make_fit_optee.sh b/arch/arm/mach-rockchip/make_fit_optee.sh
index 85b1b4f316..e4f5eee2b2 100755
--- a/arch/arm/mach-rockchip/make_fit_optee.sh
+++ b/arch/arm/mach-rockchip/make_fit_optee.sh
@@ -16,6 +16,7 @@ cat << EOF
 	images {
 		uboot@1 {
 			description = "U-Boot";
+			image = "u-boot-nodtb.bin";
 			data = /incbin/("./u-boot-nodtb.bin");
 			type = "standalone";
 			os = "U-Boot";
@@ -34,6 +35,7 @@ cat << EOF
 		};
 		optee@1 {
 			description = "OP-TEE";
+			image = "tee.bin";
 			data = /incbin/("./tee.bin");
 			type = "firmware";
 			arch = "arm";
@@ -57,6 +59,7 @@ cat << EOF
 		};
 		fdt@1 {
 			description = "U-Boot dtb";
+			image = "u-boot.dtb";
 			data = /incbin/("./u-boot.dtb");
 			type = "flat_dt";
 			compression = "none";