From 2e6f3f4c09e03d35bfc9e08fa7b7bb5fa6fee0a1 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Mon, 27 May 2019 11:14:33 +0800
Subject: [PATCH] tool: rockchip: boot/trust_merger: ignore prepath when it's
 already exist

Change-Id: I33b1b14ba7b68ab08e1e61bf98e476da3b13b56a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 tools/rockchip/boot_merger.c  | 2 +-
 tools/rockchip/trust_merger.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/rockchip/boot_merger.c b/tools/rockchip/boot_merger.c
index f258f6c3c3..e8ccea3828 100644
--- a/tools/rockchip/boot_merger.c
+++ b/tools/rockchip/boot_merger.c
@@ -149,7 +149,7 @@ static inline void fixPath(char *path)
 			strcpy(path, gNewPath);
 			strcat(path, tmp);
 		}
-	} else if (gPrePath) {
+	} else if (gPrePath && strncmp(path, gPrePath, strlen(gPrePath))) {
 		strcpy(tmp, path);
 		strcpy(path, gPrePath);
 		strcat(path, tmp);
diff --git a/tools/rockchip/trust_merger.c b/tools/rockchip/trust_merger.c
index a33125e224..601d33f9d4 100644
--- a/tools/rockchip/trust_merger.c
+++ b/tools/rockchip/trust_merger.c
@@ -110,7 +110,7 @@ static inline void fixPath(char *path)
 			strcpy(path, gNewPath);
 			strcat(path, tmp);
 		}
-	} else if (gPrePath) {
+	} else if (gPrePath && strncmp(path, gPrePath, strlen(gPrePath))) {
 		strcpy(tmp, path);
 		strcpy(path, gPrePath);
 		strcat(path, tmp);