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

.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

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: drivers/amlogic/
-:F: plat/meson/gxbb/
+: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: drivers/amlogic/gxl
-:F: plat/meson/gxl/
+:F: plat/amlogic/gxl/
 
 Armv7-A architecture port
 -------------------------

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

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>
 

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_BL_COMMON_SOURCES	:=	drivers/amlogic/console/aarch64/meson_console.S \
-				plat/meson/gxbb/gxbb_common.c		\
+				plat/amlogic/gxbb/gxbb_common.c		\
-				plat/meson/gxbb/gxbb_topology.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/amlogic/gxbb/aarch64/gxbb_helpers.S	\
-				plat/meson/gxbb/gxbb_bl31_setup.c	\
+				plat/amlogic/gxbb/gxbb_bl31_setup.c	\
-				plat/meson/gxbb/gxbb_efuse.c		\
+				plat/amlogic/gxbb/gxbb_efuse.c		\
-				plat/meson/gxbb/gxbb_mhu.c		\
+				plat/amlogic/gxbb/gxbb_mhu.c		\
-				plat/meson/gxbb/gxbb_pm.c		\
+				plat/amlogic/gxbb/gxbb_pm.c		\
-				plat/meson/gxbb/gxbb_scpi.c		\
+				plat/amlogic/gxbb/gxbb_scpi.c		\
-				plat/meson/gxbb/gxbb_sip_svc.c		\
+				plat/amlogic/gxbb/gxbb_sip_svc.c		\
-				plat/meson/gxbb/gxbb_thermal.c		\
+				plat/amlogic/gxbb/gxbb_thermal.c		\
 				${GXBB_GIC_SOURCES}
 
 # Tune compiler for Cortex-A53

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/		\
+PLAT_INCLUDES		:=	-Iinclude/drivers/amlogic/		\
-				-Iinclude/drivers/meson/gxl		\
+				-Iinclude/drivers/amlogic/gxl		\
-				-Iplat/meson/gxl/include
+				-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_BL_COMMON_SOURCES	:=	drivers/amlogic/console/aarch64/meson_console.S \
-				plat/meson/gxl/gxl_common.c		\
+				plat/amlogic/gxl/gxl_common.c		\
-				plat/meson/gxl/gxl_topology.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/amlogic/gxl/aarch64/gxl_helpers.S	\
-				plat/meson/gxl/gxl_bl31_setup.c		\
+				plat/amlogic/gxl/gxl_bl31_setup.c		\
-				plat/meson/gxl/gxl_efuse.c		\
+				plat/amlogic/gxl/gxl_efuse.c		\
-				plat/meson/gxl/gxl_mhu.c		\
+				plat/amlogic/gxl/gxl_mhu.c		\
-				plat/meson/gxl/gxl_pm.c			\
+				plat/amlogic/gxl/gxl_pm.c			\
-				plat/meson/gxl/gxl_scpi.c		\
+				plat/amlogic/gxl/gxl_scpi.c		\
-				plat/meson/gxl/gxl_sip_svc.c		\
+				plat/amlogic/gxl/gxl_sip_svc.c		\
-				plat/meson/gxl/gxl_thermal.c		\
+				plat/amlogic/gxl/gxl_thermal.c		\
-				drivers/meson/gxl/crypto/sha_dma.c	\
+				drivers/amlogic/gxl/crypto/sha_dma.c	\
 				${GXBB_GIC_SOURCES}
 
 # Tune compiler for Cortex-A53