diff options
author | Carlo Caione <ccaione@baylibre.com> | 2019-08-23 18:28:36 +0100 |
---|---|---|
committer | Carlo Caione <ccaione@baylibre.com> | 2019-09-05 10:39:25 +0100 |
commit | 4a079c752beef8c2e8072b55a267d4b597b1e05b (patch) | |
tree | f238d3473ebb0cef430977477dbea7ca72d0197b | |
parent | 3441952f61a62948ccf84c2e3eada9b340c3560d (diff) |
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
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | docs/maintainers.rst | 8 | ||||
-rw-r--r-- | drivers/amlogic/console/aarch64/meson_console.S (renamed from drivers/meson/console/aarch64/meson_console.S) | 4 | ||||
-rw-r--r-- | drivers/amlogic/gxl/crypto/sha_dma.c (renamed from drivers/meson/gxl/crypto/sha_dma.c) | 0 | ||||
-rw-r--r-- | include/drivers/amlogic/gxl/crypto/sha_dma.h (renamed from include/drivers/meson/gxl/crypto/sha_dma.h) | 0 | ||||
-rw-r--r-- | include/drivers/amlogic/meson_console.h (renamed from include/drivers/meson/meson_console.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/aarch64/gxbb_helpers.S (renamed from plat/meson/gxbb/aarch64/gxbb_helpers.S) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_bl31_setup.c (renamed from plat/meson/gxbb/gxbb_bl31_setup.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_common.c (renamed from plat/meson/gxbb/gxbb_common.c) | 4 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_def.h (renamed from plat/meson/gxbb/gxbb_def.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_efuse.c (renamed from plat/meson/gxbb/gxbb_efuse.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_mhu.c (renamed from plat/meson/gxbb/gxbb_mhu.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_pm.c (renamed from plat/meson/gxbb/gxbb_pm.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_private.h (renamed from plat/meson/gxbb/gxbb_private.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_scpi.c (renamed from plat/meson/gxbb/gxbb_scpi.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_sip_svc.c (renamed from plat/meson/gxbb/gxbb_sip_svc.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_thermal.c (renamed from plat/meson/gxbb/gxbb_thermal.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_topology.c (renamed from plat/meson/gxbb/gxbb_topology.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/include/plat_macros.S (renamed from plat/meson/gxbb/include/plat_macros.S) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/include/platform_def.h (renamed from plat/meson/gxbb/include/platform_def.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxbb/platform.mk (renamed from plat/meson/gxbb/platform.mk) | 26 | ||||
-rw-r--r-- | plat/amlogic/gxl/aarch64/gxl_helpers.S (renamed from plat/meson/gxl/aarch64/gxl_helpers.S) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_bl31_setup.c (renamed from plat/meson/gxl/gxl_bl31_setup.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_common.c (renamed from plat/meson/gxl/gxl_common.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_def.h (renamed from plat/meson/gxl/gxl_def.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_efuse.c (renamed from plat/meson/gxl/gxl_efuse.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_mhu.c (renamed from plat/meson/gxl/gxl_mhu.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_pm.c (renamed from plat/meson/gxl/gxl_pm.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_private.h (renamed from plat/meson/gxl/gxl_private.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_scpi.c (renamed from plat/meson/gxl/gxl_scpi.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_sip_svc.c (renamed from plat/meson/gxl/gxl_sip_svc.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_thermal.c (renamed from plat/meson/gxl/gxl_thermal.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_topology.c (renamed from plat/meson/gxl/gxl_topology.c) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/include/plat_macros.S (renamed from plat/meson/gxl/include/plat_macros.S) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/include/platform_def.h (renamed from plat/meson/gxl/include/platform_def.h) | 0 | ||||
-rw-r--r-- | plat/amlogic/gxl/platform.mk (renamed from plat/meson/gxl/platform.mk) | 34 | ||||
-rw-r--r-- | tools/amlogic/Makefile (renamed from tools/meson/Makefile) | 0 | ||||
-rw-r--r-- | tools/amlogic/doimage.c (renamed from tools/meson/doimage.c) | 0 |
38 files changed, 39 insertions, 39 deletions
@@ -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 cbfc652f..7731c72e 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 22d07733..e645cbab 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 a969dea7..a969dea7 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 52129a61..52129a61 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 70e3b0bd..70e3b0bd 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 760d6c46..760d6c46 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 b867a584..b867a584 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 0ca15e86..eb688f77 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 3e27097c..3e27097c 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 edea5426..edea5426 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 903ef411..903ef411 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 59b9436f..59b9436f 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 910a42c1..910a42c1 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 83eeda29..83eeda29 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 63c7dba1..63c7dba1 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 b6048eee..b6048eee 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 eec2d34d..eec2d34d 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 c721c21b..c721c21b 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 da4aedde..da4aedde 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 9e65040b..06aaaba3 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 760d6c46..760d6c46 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 b1da7942..b1da7942 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 e3bd6048..e3bd6048 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 089fa8db..089fa8db 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 b17d1b8e..b17d1b8e 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 4c1d5b60..4c1d5b60 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 4a5d26e9..4a5d26e9 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 913cbf65..913cbf65 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 13d65243..13d65243 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 74fbc80e..74fbc80e 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 3af1c6dc..3af1c6dc 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 cca3ead5..cca3ead5 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 c721c21b..c721c21b 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 b32ec56d..b32ec56d 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 a788e963..9cdf37ac 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 1a1d1f81..1a1d1f81 100644 --- a/tools/meson/Makefile +++ b/tools/amlogic/Makefile diff --git a/tools/meson/doimage.c b/tools/amlogic/doimage.c index b304038d..b304038d 100644 --- a/tools/meson/doimage.c +++ b/tools/amlogic/doimage.c |