Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
carlocaione committed Sep 5, 2019
1 parent 3441952 commit 4a079c7
Show file tree
Hide file tree
Showing 38 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/maintainers.rst
Expand Up @@ -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
-------------------------
Expand Down
@@ -1,13 +1,13 @@
/*
* 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 <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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
*/
Expand All @@ -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>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
26 changes: 13 additions & 13 deletions plat/meson/gxbb/platform.mk → 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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 17 additions & 17 deletions plat/meson/gxl/platform.mk → 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
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 4a079c7

Please sign in to comment.