From 6414dc6d978097dd035de3dc2f17851dc70eed68 Mon Sep 17 00:00:00 2001
From: Konstantin Porotchkin <kostap@marvell.com>
Date: Sun, 7 Oct 2018 17:54:20 +0300
Subject: [PATCH] tools: Move doimage to marvell folder for future add-ons

Move doimage utility from toos/doimage to tools/marvell/doimage.
This is done for supporting mode Marvell tools in the future.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
---
 maintainers.rst                                      | 2 +-
 plat/marvell/a8k/common/a8k_common.mk                | 4 ++--
 tools/{ => marvell}/doimage/Makefile                 | 0
 tools/{ => marvell}/doimage/doimage.c                | 0
 tools/{ => marvell}/doimage/doimage.mk               | 0
 tools/{ => marvell}/doimage/secure/aes_key.txt       | 0
 tools/{ => marvell}/doimage/secure/csk_priv_pem0.key | 0
 tools/{ => marvell}/doimage/secure/csk_priv_pem1.key | 0
 tools/{ => marvell}/doimage/secure/csk_priv_pem2.key | 0
 tools/{ => marvell}/doimage/secure/csk_priv_pem3.key | 0
 tools/{ => marvell}/doimage/secure/kak_priv_pem.key  | 0
 tools/{ => marvell}/doimage/secure/sec_img_7K.cfg    | 0
 tools/{ => marvell}/doimage/secure/sec_img_8K.cfg    | 0
 13 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/{ => marvell}/doimage/Makefile (100%)
 rename tools/{ => marvell}/doimage/doimage.c (100%)
 rename tools/{ => marvell}/doimage/doimage.mk (100%)
 rename tools/{ => marvell}/doimage/secure/aes_key.txt (100%)
 rename tools/{ => marvell}/doimage/secure/csk_priv_pem0.key (100%)
 rename tools/{ => marvell}/doimage/secure/csk_priv_pem1.key (100%)
 rename tools/{ => marvell}/doimage/secure/csk_priv_pem2.key (100%)
 rename tools/{ => marvell}/doimage/secure/csk_priv_pem3.key (100%)
 rename tools/{ => marvell}/doimage/secure/kak_priv_pem.key (100%)
 rename tools/{ => marvell}/doimage/secure/sec_img_7K.cfg (100%)
 rename tools/{ => marvell}/doimage/secure/sec_img_8K.cfg (100%)

diff --git a/maintainers.rst b/maintainers.rst
index 5fb44943b..1c887260c 100644
--- a/maintainers.rst
+++ b/maintainers.rst
@@ -81,7 +81,7 @@ Marvell platform ports and SoC drivers
 :F: docs/plat/marvell/
 :F: plat/marvell/
 :F: drivers/marvell/
-:F: tools/doimage/
+:F: tools/marvell/
 
 NVidia platform ports
 ---------------------
diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk
index a42481f5a..a589004bd 100644
--- a/plat/marvell/a8k/common/a8k_common.mk
+++ b/plat/marvell/a8k/common/a8k_common.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier:     BSD-3-Clause
 # https://spdx.org/licenses
 
-include tools/doimage/doimage.mk
+include tools/marvell/doimage/doimage.mk
 
 PLAT_FAMILY		:= a8k
 PLAT_FAMILY_BASE	:= plat/marvell/$(PLAT_FAMILY)
@@ -29,7 +29,7 @@ $(eval $(call assert_boolean,PCI_EP_SUPPORT))
 AP_NUM			:= 1
 $(eval $(call add_define,AP_NUM))
 
-DOIMAGEPATH		?=	tools/doimage
+DOIMAGEPATH		?=	tools/marvell/doimage
 DOIMAGETOOL		?=	${DOIMAGEPATH}/doimage
 
 ROM_BIN_EXT ?= $(BUILD_PLAT)/ble.bin
diff --git a/tools/doimage/Makefile b/tools/marvell/doimage/Makefile
similarity index 100%
rename from tools/doimage/Makefile
rename to tools/marvell/doimage/Makefile
diff --git a/tools/doimage/doimage.c b/tools/marvell/doimage/doimage.c
similarity index 100%
rename from tools/doimage/doimage.c
rename to tools/marvell/doimage/doimage.c
diff --git a/tools/doimage/doimage.mk b/tools/marvell/doimage/doimage.mk
similarity index 100%
rename from tools/doimage/doimage.mk
rename to tools/marvell/doimage/doimage.mk
diff --git a/tools/doimage/secure/aes_key.txt b/tools/marvell/doimage/secure/aes_key.txt
similarity index 100%
rename from tools/doimage/secure/aes_key.txt
rename to tools/marvell/doimage/secure/aes_key.txt
diff --git a/tools/doimage/secure/csk_priv_pem0.key b/tools/marvell/doimage/secure/csk_priv_pem0.key
similarity index 100%
rename from tools/doimage/secure/csk_priv_pem0.key
rename to tools/marvell/doimage/secure/csk_priv_pem0.key
diff --git a/tools/doimage/secure/csk_priv_pem1.key b/tools/marvell/doimage/secure/csk_priv_pem1.key
similarity index 100%
rename from tools/doimage/secure/csk_priv_pem1.key
rename to tools/marvell/doimage/secure/csk_priv_pem1.key
diff --git a/tools/doimage/secure/csk_priv_pem2.key b/tools/marvell/doimage/secure/csk_priv_pem2.key
similarity index 100%
rename from tools/doimage/secure/csk_priv_pem2.key
rename to tools/marvell/doimage/secure/csk_priv_pem2.key
diff --git a/tools/doimage/secure/csk_priv_pem3.key b/tools/marvell/doimage/secure/csk_priv_pem3.key
similarity index 100%
rename from tools/doimage/secure/csk_priv_pem3.key
rename to tools/marvell/doimage/secure/csk_priv_pem3.key
diff --git a/tools/doimage/secure/kak_priv_pem.key b/tools/marvell/doimage/secure/kak_priv_pem.key
similarity index 100%
rename from tools/doimage/secure/kak_priv_pem.key
rename to tools/marvell/doimage/secure/kak_priv_pem.key
diff --git a/tools/doimage/secure/sec_img_7K.cfg b/tools/marvell/doimage/secure/sec_img_7K.cfg
similarity index 100%
rename from tools/doimage/secure/sec_img_7K.cfg
rename to tools/marvell/doimage/secure/sec_img_7K.cfg
diff --git a/tools/doimage/secure/sec_img_8K.cfg b/tools/marvell/doimage/secure/sec_img_8K.cfg
similarity index 100%
rename from tools/doimage/secure/sec_img_8K.cfg
rename to tools/marvell/doimage/secure/sec_img_8K.cfg