meson: Rename platform directory to amlogic

Meson is the internal code name for the SoC family. The correct name for
the platform should be Amlogic. Change the name of the platform
directory.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: Icc140e1ea137f12117acbf64c7dcb1a8b66b345d

38 files changed, 39 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index 6b1e05774..2abfffb40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ tools/cert_create/src/**/*.o
 tools/cert_create/cert_create
 tools/cert_create/cert_create.exe
 tools/marvell/doimage/doimage
-tools/meson/doimage
+tools/amlogic/doimage
 tools/stm32image/*.o
 tools/stm32image/stm32image
 tools/stm32image/stm32image.exe
diff --git a/docs/maintainers.rst b/docs/maintainers.rst
index cbfc652fb..7731c72ec 100644
--- a/docs/maintainers.rst
+++ b/docs/maintainers.rst
@@ -37,16 +37,16 @@ Amlogic Meson S905 (GXBB) platform port
 :M: Andre Przywara <andre.przywara@arm.com>
 :G: `Andre-ARM`_
 :F: docs/plat/meson-gxbb.rst
-:F: drivers/meson/
-:F: plat/meson/gxbb/
+:F: drivers/amlogic/
+:F: plat/amlogic/gxbb/
 
 Amlogic Meson S905x (GXL) platform port
 ---------------------------------------
 :M: Remi Pommarel <repk@triplefau.lt>
 :G: `remi-triplefault`_
 :F: docs/plat/meson-gxl.rst
-:F: drivers/meson/gxl
-:F: plat/meson/gxl/
+:F: drivers/amlogic/gxl
+:F: plat/amlogic/gxl/
 
 Armv7-A architecture port
 -------------------------
diff --git a/drivers/meson/console/aarch64/meson_console.S b/drivers/amlogic/console/aarch64/meson_console.S
index 22d077332..e645cbab8 100644
--- a/drivers/meson/console/aarch64/meson_console.S
+++ b/drivers/amlogic/console/aarch64/meson_console.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -7,7 +7,7 @@
 #include <asm_macros.S>
 #include <assert_macros.S>
 #include <console_macros.S>
-#include <drivers/meson/meson_console.h>
+#include <drivers/amlogic/meson_console.h>
 
 	.globl console_meson_register
 	.globl console_meson_init
diff --git a/drivers/meson/gxl/crypto/sha_dma.c b/drivers/amlogic/gxl/crypto/sha_dma.c
index a969dea74..a969dea74 100644
--- a/drivers/meson/gxl/crypto/sha_dma.c
+++ b/drivers/amlogic/gxl/crypto/sha_dma.c
diff --git a/include/drivers/meson/gxl/crypto/sha_dma.h b/include/drivers/amlogic/gxl/crypto/sha_dma.h
index 52129a61f..52129a61f 100644
--- a/include/drivers/meson/gxl/crypto/sha_dma.h
+++ b/include/drivers/amlogic/gxl/crypto/sha_dma.h
diff --git a/include/drivers/meson/meson_console.h b/include/drivers/amlogic/meson_console.h
index 70e3b0bd4..70e3b0bd4 100644
--- a/include/drivers/meson/meson_console.h
+++ b/include/drivers/amlogic/meson_console.h
diff --git a/plat/meson/gxbb/aarch64/gxbb_helpers.S b/plat/amlogic/gxbb/aarch64/gxbb_helpers.S
index 760d6c46d..760d6c46d 100644
--- a/plat/meson/gxbb/aarch64/gxbb_helpers.S
+++ b/plat/amlogic/gxbb/aarch64/gxbb_helpers.S
diff --git a/plat/meson/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c
index b867a5846..b867a5846 100644
--- a/plat/meson/gxbb/gxbb_bl31_setup.c
+++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c
diff --git a/plat/meson/gxbb/gxbb_common.c b/plat/amlogic/gxbb/gxbb_common.c
index 0ca15e860..eb688f772 100644
--- a/plat/meson/gxbb/gxbb_common.c
+++ b/plat/amlogic/gxbb/gxbb_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -13,7 +13,7 @@
 #include <common/bl_common.h>
 #include <common/debug.h>
 #include <common/ep_info.h>
-#include <drivers/meson/meson_console.h>
+#include <drivers/amlogic/meson_console.h>
 #include <lib/mmio.h>
 #include <lib/xlat_tables/xlat_tables_v2.h>
 
diff --git a/plat/meson/gxbb/gxbb_def.h b/plat/amlogic/gxbb/gxbb_def.h
index 3e27097c3..3e27097c3 100644
--- a/plat/meson/gxbb/gxbb_def.h
+++ b/plat/amlogic/gxbb/gxbb_def.h
diff --git a/plat/meson/gxbb/gxbb_efuse.c b/plat/amlogic/gxbb/gxbb_efuse.c
index edea5426c..edea5426c 100644
--- a/plat/meson/gxbb/gxbb_efuse.c
+++ b/plat/amlogic/gxbb/gxbb_efuse.c
diff --git a/plat/meson/gxbb/gxbb_mhu.c b/plat/amlogic/gxbb/gxbb_mhu.c
index 903ef411c..903ef411c 100644
--- a/plat/meson/gxbb/gxbb_mhu.c
+++ b/plat/amlogic/gxbb/gxbb_mhu.c
diff --git a/plat/meson/gxbb/gxbb_pm.c b/plat/amlogic/gxbb/gxbb_pm.c
index 59b9436fe..59b9436fe 100644
--- a/plat/meson/gxbb/gxbb_pm.c
+++ b/plat/amlogic/gxbb/gxbb_pm.c
diff --git a/plat/meson/gxbb/gxbb_private.h b/plat/amlogic/gxbb/gxbb_private.h
index 910a42c1c..910a42c1c 100644
--- a/plat/meson/gxbb/gxbb_private.h
+++ b/plat/amlogic/gxbb/gxbb_private.h
diff --git a/plat/meson/gxbb/gxbb_scpi.c b/plat/amlogic/gxbb/gxbb_scpi.c
index 83eeda29d..83eeda29d 100644
--- a/plat/meson/gxbb/gxbb_scpi.c
+++ b/plat/amlogic/gxbb/gxbb_scpi.c
diff --git a/plat/meson/gxbb/gxbb_sip_svc.c b/plat/amlogic/gxbb/gxbb_sip_svc.c
index 63c7dba15..63c7dba15 100644
--- a/plat/meson/gxbb/gxbb_sip_svc.c
+++ b/plat/amlogic/gxbb/gxbb_sip_svc.c
diff --git a/plat/meson/gxbb/gxbb_thermal.c b/plat/amlogic/gxbb/gxbb_thermal.c
index b6048eee4..b6048eee4 100644
--- a/plat/meson/gxbb/gxbb_thermal.c
+++ b/plat/amlogic/gxbb/gxbb_thermal.c
diff --git a/plat/meson/gxbb/gxbb_topology.c b/plat/amlogic/gxbb/gxbb_topology.c
index eec2d34d4..eec2d34d4 100644
--- a/plat/meson/gxbb/gxbb_topology.c
+++ b/plat/amlogic/gxbb/gxbb_topology.c
diff --git a/plat/meson/gxbb/include/plat_macros.S b/plat/amlogic/gxbb/include/plat_macros.S
index c721c21b6..c721c21b6 100644
--- a/plat/meson/gxbb/include/plat_macros.S
+++ b/plat/amlogic/gxbb/include/plat_macros.S
diff --git a/plat/meson/gxbb/include/platform_def.h b/plat/amlogic/gxbb/include/platform_def.h
index da4aedde8..da4aedde8 100644
--- a/plat/meson/gxbb/include/platform_def.h
+++ b/plat/amlogic/gxbb/include/platform_def.h
diff --git a/plat/meson/gxbb/platform.mk b/plat/amlogic/gxbb/platform.mk
index 9e65040b9..06aaaba3f 100644
--- a/plat/meson/gxbb/platform.mk
+++ b/plat/amlogic/gxbb/platform.mk
@@ -1,33 +1,33 @@
 #
-# Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 include lib/xlat_tables_v2/xlat_tables.mk
 
-PLAT_INCLUDES		:=	-Iplat/meson/gxbb/include
+PLAT_INCLUDES		:=	-Iplat/amlogic/gxbb/include
 
 GXBB_GIC_SOURCES	:=	drivers/arm/gic/common/gic_common.c	\
 				drivers/arm/gic/v2/gicv2_main.c		\
 				drivers/arm/gic/v2/gicv2_helpers.c	\
 				plat/common/plat_gicv2.c
 
-PLAT_BL_COMMON_SOURCES	:=	drivers/meson/console/aarch64/meson_console.S \
-				plat/meson/gxbb/gxbb_common.c		\
-				plat/meson/gxbb/gxbb_topology.c		\
+PLAT_BL_COMMON_SOURCES	:=	drivers/amlogic/console/aarch64/meson_console.S \
+				plat/amlogic/gxbb/gxbb_common.c		\
+				plat/amlogic/gxbb/gxbb_topology.c		\
 				${XLAT_TABLES_LIB_SRCS}
 
 BL31_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				plat/common/plat_psci_common.c		\
-				plat/meson/gxbb/aarch64/gxbb_helpers.S	\
-				plat/meson/gxbb/gxbb_bl31_setup.c	\
-				plat/meson/gxbb/gxbb_efuse.c		\
-				plat/meson/gxbb/gxbb_mhu.c		\
-				plat/meson/gxbb/gxbb_pm.c		\
-				plat/meson/gxbb/gxbb_scpi.c		\
-				plat/meson/gxbb/gxbb_sip_svc.c		\
-				plat/meson/gxbb/gxbb_thermal.c		\
+				plat/amlogic/gxbb/aarch64/gxbb_helpers.S	\
+				plat/amlogic/gxbb/gxbb_bl31_setup.c	\
+				plat/amlogic/gxbb/gxbb_efuse.c		\
+				plat/amlogic/gxbb/gxbb_mhu.c		\
+				plat/amlogic/gxbb/gxbb_pm.c		\
+				plat/amlogic/gxbb/gxbb_scpi.c		\
+				plat/amlogic/gxbb/gxbb_sip_svc.c		\
+				plat/amlogic/gxbb/gxbb_thermal.c		\
 				${GXBB_GIC_SOURCES}
 
 # Tune compiler for Cortex-A53
diff --git a/plat/meson/gxl/aarch64/gxl_helpers.S b/plat/amlogic/gxl/aarch64/gxl_helpers.S
index 760d6c46d..760d6c46d 100644
--- a/plat/meson/gxl/aarch64/gxl_helpers.S
+++ b/plat/amlogic/gxl/aarch64/gxl_helpers.S
diff --git a/plat/meson/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c
index b1da7942b..b1da7942b 100644
--- a/plat/meson/gxl/gxl_bl31_setup.c
+++ b/plat/amlogic/gxl/gxl_bl31_setup.c
diff --git a/plat/meson/gxl/gxl_common.c b/plat/amlogic/gxl/gxl_common.c
index e3bd6048a..e3bd6048a 100644
--- a/plat/meson/gxl/gxl_common.c
+++ b/plat/amlogic/gxl/gxl_common.c
diff --git a/plat/meson/gxl/gxl_def.h b/plat/amlogic/gxl/gxl_def.h
index 089fa8db9..089fa8db9 100644
--- a/plat/meson/gxl/gxl_def.h
+++ b/plat/amlogic/gxl/gxl_def.h
diff --git a/plat/meson/gxl/gxl_efuse.c b/plat/amlogic/gxl/gxl_efuse.c
index b17d1b8e3..b17d1b8e3 100644
--- a/plat/meson/gxl/gxl_efuse.c
+++ b/plat/amlogic/gxl/gxl_efuse.c
diff --git a/plat/meson/gxl/gxl_mhu.c b/plat/amlogic/gxl/gxl_mhu.c
index 4c1d5b600..4c1d5b600 100644
--- a/plat/meson/gxl/gxl_mhu.c
+++ b/plat/amlogic/gxl/gxl_mhu.c
diff --git a/plat/meson/gxl/gxl_pm.c b/plat/amlogic/gxl/gxl_pm.c
index 4a5d26e90..4a5d26e90 100644
--- a/plat/meson/gxl/gxl_pm.c
+++ b/plat/amlogic/gxl/gxl_pm.c
diff --git a/plat/meson/gxl/gxl_private.h b/plat/amlogic/gxl/gxl_private.h
index 913cbf653..913cbf653 100644
--- a/plat/meson/gxl/gxl_private.h
+++ b/plat/amlogic/gxl/gxl_private.h
diff --git a/plat/meson/gxl/gxl_scpi.c b/plat/amlogic/gxl/gxl_scpi.c
index 13d652436..13d652436 100644
--- a/plat/meson/gxl/gxl_scpi.c
+++ b/plat/amlogic/gxl/gxl_scpi.c
diff --git a/plat/meson/gxl/gxl_sip_svc.c b/plat/amlogic/gxl/gxl_sip_svc.c
index 74fbc80e4..74fbc80e4 100644
--- a/plat/meson/gxl/gxl_sip_svc.c
+++ b/plat/amlogic/gxl/gxl_sip_svc.c
diff --git a/plat/meson/gxl/gxl_thermal.c b/plat/amlogic/gxl/gxl_thermal.c
index 3af1c6dc6..3af1c6dc6 100644
--- a/plat/meson/gxl/gxl_thermal.c
+++ b/plat/amlogic/gxl/gxl_thermal.c
diff --git a/plat/meson/gxl/gxl_topology.c b/plat/amlogic/gxl/gxl_topology.c
index cca3ead50..cca3ead50 100644
--- a/plat/meson/gxl/gxl_topology.c
+++ b/plat/amlogic/gxl/gxl_topology.c
diff --git a/plat/meson/gxl/include/plat_macros.S b/plat/amlogic/gxl/include/plat_macros.S
index c721c21b6..c721c21b6 100644
--- a/plat/meson/gxl/include/plat_macros.S
+++ b/plat/amlogic/gxl/include/plat_macros.S
diff --git a/plat/meson/gxl/include/platform_def.h b/plat/amlogic/gxl/include/platform_def.h
index b32ec56da..b32ec56da 100644
--- a/plat/meson/gxl/include/platform_def.h
+++ b/plat/amlogic/gxl/include/platform_def.h
diff --git a/plat/meson/gxl/platform.mk b/plat/amlogic/gxl/platform.mk
index a788e9639..9cdf37ac9 100644
--- a/plat/meson/gxl/platform.mk
+++ b/plat/amlogic/gxl/platform.mk
@@ -1,39 +1,39 @@
 #
-# Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 include lib/xlat_tables_v2/xlat_tables.mk
 
-DOIMAGEPATH		?=	tools/meson
+DOIMAGEPATH		?=	tools/amlogic
 DOIMAGETOOL		?=	${DOIMAGEPATH}/doimage
 
-PLAT_INCLUDES		:=	-Iinclude/drivers/meson/		\
-				-Iinclude/drivers/meson/gxl		\
-				-Iplat/meson/gxl/include
+PLAT_INCLUDES		:=	-Iinclude/drivers/amlogic/		\
+				-Iinclude/drivers/amlogic/gxl		\
+				-Iplat/amlogic/gxl/include
 
 GXBB_GIC_SOURCES	:=	drivers/arm/gic/common/gic_common.c	\
 				drivers/arm/gic/v2/gicv2_main.c		\
 				drivers/arm/gic/v2/gicv2_helpers.c	\
 				plat/common/plat_gicv2.c
 
-PLAT_BL_COMMON_SOURCES	:=	drivers/meson/console/aarch64/meson_console.S \
-				plat/meson/gxl/gxl_common.c		\
-				plat/meson/gxl/gxl_topology.c		\
+PLAT_BL_COMMON_SOURCES	:=	drivers/amlogic/console/aarch64/meson_console.S \
+				plat/amlogic/gxl/gxl_common.c		\
+				plat/amlogic/gxl/gxl_topology.c		\
 				${XLAT_TABLES_LIB_SRCS}
 
 BL31_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				plat/common/plat_psci_common.c		\
-				plat/meson/gxl/aarch64/gxl_helpers.S	\
-				plat/meson/gxl/gxl_bl31_setup.c		\
-				plat/meson/gxl/gxl_efuse.c		\
-				plat/meson/gxl/gxl_mhu.c		\
-				plat/meson/gxl/gxl_pm.c			\
-				plat/meson/gxl/gxl_scpi.c		\
-				plat/meson/gxl/gxl_sip_svc.c		\
-				plat/meson/gxl/gxl_thermal.c		\
-				drivers/meson/gxl/crypto/sha_dma.c	\
+				plat/amlogic/gxl/aarch64/gxl_helpers.S	\
+				plat/amlogic/gxl/gxl_bl31_setup.c		\
+				plat/amlogic/gxl/gxl_efuse.c		\
+				plat/amlogic/gxl/gxl_mhu.c		\
+				plat/amlogic/gxl/gxl_pm.c			\
+				plat/amlogic/gxl/gxl_scpi.c		\
+				plat/amlogic/gxl/gxl_sip_svc.c		\
+				plat/amlogic/gxl/gxl_thermal.c		\
+				drivers/amlogic/gxl/crypto/sha_dma.c	\
 				${GXBB_GIC_SOURCES}
 
 # Tune compiler for Cortex-A53
diff --git a/tools/meson/Makefile b/tools/amlogic/Makefile
index 1a1d1f812..1a1d1f812 100644
--- a/tools/meson/Makefile
+++ b/tools/amlogic/Makefile
diff --git a/tools/meson/doimage.c b/tools/amlogic/doimage.c
index b304038d1..b304038d1 100644
--- a/tools/meson/doimage.c
+++ b/tools/amlogic/doimage.c