summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maintainers.rst2
-rw-r--r--plat/marvell/a8k/common/a8k_common.mk4
-rw-r--r--tools/marvell/doimage/Makefile (renamed from tools/doimage/Makefile)0
-rw-r--r--tools/marvell/doimage/doimage.c (renamed from tools/doimage/doimage.c)0
-rw-r--r--tools/marvell/doimage/doimage.mk (renamed from tools/doimage/doimage.mk)0
-rw-r--r--tools/marvell/doimage/secure/aes_key.txt (renamed from tools/doimage/secure/aes_key.txt)0
-rw-r--r--tools/marvell/doimage/secure/csk_priv_pem0.key (renamed from tools/doimage/secure/csk_priv_pem0.key)0
-rw-r--r--tools/marvell/doimage/secure/csk_priv_pem1.key (renamed from tools/doimage/secure/csk_priv_pem1.key)0
-rw-r--r--tools/marvell/doimage/secure/csk_priv_pem2.key (renamed from tools/doimage/secure/csk_priv_pem2.key)0
-rw-r--r--tools/marvell/doimage/secure/csk_priv_pem3.key (renamed from tools/doimage/secure/csk_priv_pem3.key)0
-rw-r--r--tools/marvell/doimage/secure/kak_priv_pem.key (renamed from tools/doimage/secure/kak_priv_pem.key)0
-rw-r--r--tools/marvell/doimage/secure/sec_img_7K.cfg (renamed from tools/doimage/secure/sec_img_7K.cfg)0
-rw-r--r--tools/marvell/doimage/secure/sec_img_8K.cfg (renamed from tools/doimage/secure/sec_img_8K.cfg)0
13 files changed, 3 insertions, 3 deletions
diff --git a/maintainers.rst b/maintainers.rst
index 5fb44943..1c887260 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 a42481f5..a589004b 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
index 9f0d89d3..9f0d89d3 100644
--- a/tools/doimage/Makefile
+++ b/tools/marvell/doimage/Makefile
diff --git a/tools/doimage/doimage.c b/tools/marvell/doimage/doimage.c
index 82fd375f..82fd375f 100644
--- a/tools/doimage/doimage.c
+++ b/tools/marvell/doimage/doimage.c
diff --git a/tools/doimage/doimage.mk b/tools/marvell/doimage/doimage.mk
index 2b751d40..2b751d40 100644
--- a/tools/doimage/doimage.mk
+++ b/tools/marvell/doimage/doimage.mk
diff --git a/tools/doimage/secure/aes_key.txt b/tools/marvell/doimage/secure/aes_key.txt
index 3e8a8883..3e8a8883 100644
--- a/tools/doimage/secure/aes_key.txt
+++ b/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
index 0840c2a0..0840c2a0 100644
--- a/tools/doimage/secure/csk_priv_pem0.key
+++ b/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
index 91d1aeb1..91d1aeb1 100644
--- a/tools/doimage/secure/csk_priv_pem1.key
+++ b/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
index ea47ac5f..ea47ac5f 100644
--- a/tools/doimage/secure/csk_priv_pem2.key
+++ b/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
index e40a8642..e40a8642 100644
--- a/tools/doimage/secure/csk_priv_pem3.key
+++ b/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
index dfceabae..dfceabae 100644
--- a/tools/doimage/secure/kak_priv_pem.key
+++ b/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
index 459f731e..459f731e 100644
--- a/tools/doimage/secure/sec_img_7K.cfg
+++ b/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
index a849dffd..a849dffd 100644
--- a/tools/doimage/secure/sec_img_8K.cfg
+++ b/tools/marvell/doimage/secure/sec_img_8K.cfg