amlogic: Move topology file to common directory
As done already for multiple files, move the topology file to the common directory. Signed-off-by: Carlo Caione <ccaione@baylibre.com> Change-Id: Iaca357a089593ad58c35c05c929239132249dcda
This commit is contained in:
parent
cd94cc4013
commit
261e7fd7b6
|
@ -1,55 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
#include <platform_def.h>
|
|
||||||
|
|
||||||
#include <arch.h>
|
|
||||||
|
|
||||||
#include "aml_private.h"
|
|
||||||
|
|
||||||
/* The power domain tree descriptor */
|
|
||||||
static unsigned char power_domain_tree_desc[] = {
|
|
||||||
/* Number of root nodes */
|
|
||||||
PLATFORM_CLUSTER_COUNT,
|
|
||||||
/* Number of children for the first node */
|
|
||||||
PLATFORM_CLUSTER0_CORE_COUNT
|
|
||||||
};
|
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
* This function returns the ARM default topology tree information.
|
|
||||||
******************************************************************************/
|
|
||||||
const unsigned char *plat_get_power_domain_tree_desc(void)
|
|
||||||
{
|
|
||||||
return power_domain_tree_desc;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
* This function implements a part of the critical interface between the psci
|
|
||||||
* generic layer and the platform that allows the former to query the platform
|
|
||||||
* to convert an MPIDR to a unique linear index. An error code (-1) is returned
|
|
||||||
* in case the MPIDR is invalid.
|
|
||||||
******************************************************************************/
|
|
||||||
int plat_core_pos_by_mpidr(u_register_t mpidr)
|
|
||||||
{
|
|
||||||
unsigned int cluster_id, cpu_id;
|
|
||||||
|
|
||||||
mpidr &= MPIDR_AFFINITY_MASK;
|
|
||||||
if (mpidr & ~(MPIDR_CLUSTER_MASK | MPIDR_CPU_MASK))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
cluster_id = (mpidr >> MPIDR_AFF1_SHIFT) & MPIDR_AFFLVL_MASK;
|
|
||||||
cpu_id = (mpidr >> MPIDR_AFF0_SHIFT) & MPIDR_AFFLVL_MASK;
|
|
||||||
|
|
||||||
if (cluster_id >= PLATFORM_CLUSTER_COUNT)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (cpu_id >= PLATFORM_MAX_CPUS_PER_CLUSTER)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return plat_gxbb_calc_core_pos(mpidr);
|
|
||||||
}
|
|
|
@ -21,7 +21,7 @@ GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
|
||||||
|
|
||||||
PLAT_BL_COMMON_SOURCES := drivers/amlogic/console/aarch64/meson_console.S \
|
PLAT_BL_COMMON_SOURCES := drivers/amlogic/console/aarch64/meson_console.S \
|
||||||
${AML_PLAT_SOC}/gxbb_common.c \
|
${AML_PLAT_SOC}/gxbb_common.c \
|
||||||
${AML_PLAT_SOC}/gxbb_topology.c \
|
${AML_PLAT_COMMON}/aml_topology.c \
|
||||||
${XLAT_TABLES_LIB_SRCS}
|
${XLAT_TABLES_LIB_SRCS}
|
||||||
|
|
||||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||||
|
|
|
@ -24,7 +24,7 @@ GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
|
||||||
|
|
||||||
PLAT_BL_COMMON_SOURCES := drivers/amlogic/console/aarch64/meson_console.S \
|
PLAT_BL_COMMON_SOURCES := drivers/amlogic/console/aarch64/meson_console.S \
|
||||||
${AML_PLAT_SOC}/gxl_common.c \
|
${AML_PLAT_SOC}/gxl_common.c \
|
||||||
${AML_PLAT_SOC}/gxl_topology.c \
|
${AML_PLAT_COMMON}/aml_topology.c \
|
||||||
${XLAT_TABLES_LIB_SRCS}
|
${XLAT_TABLES_LIB_SRCS}
|
||||||
|
|
||||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||||
|
|
Loading…
Reference in New Issue