sgi: sgm: Migrate to new interfaces
- Remove references to removed build options. - Remove support for LOAD_IMAGE_V2=0. Change-Id: I296385ef2ebf829446c76a54400d73f963ed265f Tested-by: Nariman Poushin <nariman.poushin@linaro.org> Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
parent
e7d23bf498
commit
9e119a4025
|
@ -62,11 +62,6 @@
|
||||||
|
|
||||||
#define PLAT_MAX_PWR_LVL U(1)
|
#define PLAT_MAX_PWR_LVL U(1)
|
||||||
|
|
||||||
#define PLAT_ARM_G1S_IRQS ARM_G1S_IRQS, \
|
|
||||||
CSS_IRQ_MHU
|
|
||||||
|
|
||||||
#define PLAT_ARM_G0_IRQS ARM_G0_IRQS
|
|
||||||
|
|
||||||
#define PLAT_ARM_G1S_IRQ_PROPS(grp) CSS_G1S_IRQ_PROPS(grp)
|
#define PLAT_ARM_G1S_IRQ_PROPS(grp) CSS_G1S_IRQ_PROPS(grp)
|
||||||
#define PLAT_ARM_G0_IRQ_PROPS(grp) ARM_G0_IRQ_PROPS(grp)
|
#define PLAT_ARM_G0_IRQ_PROPS(grp) ARM_G0_IRQ_PROPS(grp)
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#ifndef __SGI_PLAT_CONFIG_H__
|
#ifndef __SGI_PLAT_CONFIG_H__
|
||||||
#define __SGI_PLAT_CONFIG_H__
|
#define __SGI_PLAT_CONFIG_H__
|
||||||
|
|
||||||
#include <arm_gic.h>
|
|
||||||
#include <ccn.h>
|
#include <ccn.h>
|
||||||
#include <gicv3.h>
|
#include <gicv3.h>
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
CSS_USE_SCMI_SDS_DRIVER := 1
|
CSS_USE_SCMI_SDS_DRIVER := 1
|
||||||
|
|
||||||
ENABLE_PLAT_COMPAT := 0
|
|
||||||
|
|
||||||
CSS_ENT_BASE := plat/arm/css/sgi
|
CSS_ENT_BASE := plat/arm/css/sgi
|
||||||
|
|
||||||
RAS_EXTENSION := 0
|
RAS_EXTENSION := 0
|
||||||
|
|
|
@ -65,7 +65,7 @@ const mmap_region_t plat_arm_mmap[] = {
|
||||||
#if ENABLE_SPM
|
#if ENABLE_SPM
|
||||||
ARM_SP_IMAGE_MMAP,
|
ARM_SP_IMAGE_MMAP,
|
||||||
#endif
|
#endif
|
||||||
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2 && !BL2_AT_EL3
|
#if TRUSTED_BOARD_BOOT && !BL2_AT_EL3
|
||||||
ARM_MAP_BL1_RW,
|
ARM_MAP_BL1_RW,
|
||||||
#endif
|
#endif
|
||||||
{0}
|
{0}
|
||||||
|
@ -148,7 +148,7 @@ const struct secure_partition_boot_info *plat_get_secure_partition_boot_info(
|
||||||
}
|
}
|
||||||
#endif /* ENABLE_SPM && defined(IMAGE_BL31) */
|
#endif /* ENABLE_SPM && defined(IMAGE_BL31) */
|
||||||
|
|
||||||
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2
|
#if TRUSTED_BOARD_BOOT
|
||||||
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
|
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
|
||||||
{
|
{
|
||||||
assert(heap_addr != NULL);
|
assert(heap_addr != NULL);
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#ifndef __SGM_PLAT_CONFIG_H__
|
#ifndef __SGM_PLAT_CONFIG_H__
|
||||||
#define __SGM_PLAT_CONFIG_H__
|
#define __SGM_PLAT_CONFIG_H__
|
||||||
|
|
||||||
#include <arm_gic.h>
|
|
||||||
#include <ccn.h>
|
#include <ccn.h>
|
||||||
#include <gicv3.h>
|
#include <gicv3.h>
|
||||||
|
|
||||||
|
|
|
@ -48,9 +48,6 @@ BL31_SOURCES += $(SGM_CPU_SOURCES) \
|
||||||
# sgm uses CCI-500 as Cache Coherent Interconnect
|
# sgm uses CCI-500 as Cache Coherent Interconnect
|
||||||
ARM_CCI_PRODUCT_ID := 500
|
ARM_CCI_PRODUCT_ID := 500
|
||||||
|
|
||||||
# Disable the PSCI platform compatibility layer
|
|
||||||
ENABLE_PLAT_COMPAT := 0
|
|
||||||
|
|
||||||
# System coherency is managed in hardware
|
# System coherency is managed in hardware
|
||||||
HW_ASSISTED_COHERENCY := 1
|
HW_ASSISTED_COHERENCY := 1
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ const mmap_region_t plat_arm_mmap[] = {
|
||||||
#ifdef SPD_opteed
|
#ifdef SPD_opteed
|
||||||
ARM_OPTEE_PAGEABLE_LOAD_MEM,
|
ARM_OPTEE_PAGEABLE_LOAD_MEM,
|
||||||
#endif
|
#endif
|
||||||
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2 && !BL2_AT_EL3
|
#if TRUSTED_BOARD_BOOT && !BL2_AT_EL3
|
||||||
ARM_MAP_BL1_RW,
|
ARM_MAP_BL1_RW,
|
||||||
#endif
|
#endif
|
||||||
{0}
|
{0}
|
||||||
|
|
|
@ -68,7 +68,7 @@ css_plat_config_t *get_plat_config(void)
|
||||||
return css_plat_info;
|
return css_plat_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2
|
#if TRUSTED_BOARD_BOOT
|
||||||
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
|
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
|
||||||
{
|
{
|
||||||
assert(heap_addr != NULL);
|
assert(heap_addr != NULL);
|
||||||
|
|
Loading…
Reference in New Issue