Move all TI K3 packages to the directory ti-k3.

This patch is preparatory for future developments.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Added in v4

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 boot/Config.in                                      |  5 +----
 boot/ti-k3/Config.in                                | 13 +++++++++++++
 boot/ti-k3/common.mk                                |  1 +
 boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in      |  0
 .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash    |  0
 .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk      |  0
 boot/{ => ti-k3}/ti-k3-core-secdev/Config.in        |  0
 .../ti-k3-core-secdev/ti-k3-core-secdev.hash        |  0
 .../ti-k3-core-secdev/ti-k3-core-secdev.mk          |  0
 boot/{ => ti-k3}/ti-k3-image-gen/Config.in          |  0
 .../ti-k3-image-gen/ti-k3-image-gen.hash            |  0
 boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk |  0
 boot/{ => ti-k3}/ti-k3-r5-loader/Config.in          |  0
 .../ti-k3-r5-loader/ti-k3-r5-loader.hash            |  0
 boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk |  0
 configs/ti_am62x_sk_defconfig                       |  1 +
 configs/ti_am64x_sk_defconfig                       |  1 +
 17 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 boot/ti-k3/Config.in
 create mode 100644 boot/ti-k3/common.mk
 rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%)
 rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%)
 rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%)
 rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%)
 rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%)
 rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%)
 rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%)
 rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%)
 rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%)
 rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%)
 rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%)
 rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%)

diff --git a/boot/Config.in b/boot/Config.in
index 18a7d268f95a..74a64a096afc 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -19,10 +19,7 @@ source "boot/opensbi/Config.in"
 source "boot/s500-bootloader/Config.in"
 source "boot/shim/Config.in"
 source "boot/syslinux/Config.in"
-source "boot/ti-k3-boot-firmware/Config.in"
-source "boot/ti-k3-core-secdev/Config.in"
-source "boot/ti-k3-image-gen/Config.in"
-source "boot/ti-k3-r5-loader/Config.in"
+source "boot/ti-k3/Config.in"
 source "boot/uboot/Config.in"
 source "boot/vexpress-firmware/Config.in"

diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in
new file mode 100644
index 000000000000..06dda2f156a9
--- /dev/null
+++ b/boot/ti-k3/Config.in
@@ -0,0 +1,13 @@
+config BR2_TARGET_TI_K3
+       bool "TI K3"
+       help
+         The TI K3 bootloaders and tools.
+
+if BR2_TARGET_TI_K3
+
+source "boot/ti-k3/ti-k3-boot-firmware/Config.in"
+source "boot/ti-k3/ti-k3-core-secdev/Config.in"
+source "boot/ti-k3/ti-k3-image-gen/Config.in"
+source "boot/ti-k3/ti-k3-r5-loader/Config.in"
+
+endif
diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk
new file mode 100644
index 000000000000..18a1329baa4c
--- /dev/null
+++ b/boot/ti-k3/common.mk
@@ -0,0 +1 @@
+include $(sort $(wildcard boot/ti-k3/*/*.mk))
diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3/ti-k3-boot-firmware/Config.in
similarity index 100%
rename from boot/ti-k3-boot-firmware/Config.in
rename to boot/ti-k3/ti-k3-boot-firmware/Config.in
diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash
similarity index 100%
rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash
rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash
diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk
similarity index 100%
rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk
rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk
diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3/ti-k3-core-secdev/Config.in
similarity index 100%
rename from boot/ti-k3-core-secdev/Config.in
rename to boot/ti-k3/ti-k3-core-secdev/Config.in
diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash
similarity index 100%
rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash
rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash
diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk
similarity index 100%
rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk
rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk
diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in
similarity index 100%
rename from boot/ti-k3-image-gen/Config.in
rename to boot/ti-k3/ti-k3-image-gen/Config.in
diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash
similarity index 100%
rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash
rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash
diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk
similarity index 100%
rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk
rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3/ti-k3-r5-loader/Config.in
similarity index 100%
rename from boot/ti-k3-r5-loader/Config.in
rename to boot/ti-k3/ti-k3-r5-loader/Config.in
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash
similarity index 100%
rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk
similarity index 100%
rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 4de39fb897fd..cd26235342e4 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"
 BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x"
+BR2_TARGET_TI_K3=y
 BR2_TARGET_TI_K3_IMAGE_GEN=y
 BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y
 BR2_TARGET_TI_K3_R5_LOADER=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 5fd9653b5b8f..1befeb4ab96c 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x"
 BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x"
+BR2_TARGET_TI_K3=y
 BR2_TARGET_TI_K3_IMAGE_GEN=y
 BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y
 BR2_TARGET_TI_K3_R5_LOADER=y
--
2.43.0