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>

diff --git a/plat/arm/css/sgi/include/platform_def.h b/plat/arm/css/sgi/include/platform_def.h
index c645d109e12d401503b13d219f542ea6933e03a8..ce86a75a91a8f78cd16f660ee6580b1b5fd35595 100644 (file)
--- a/plat/arm/css/sgi/include/platform_def.h
+++ b/plat/arm/css/sgi/include/platform_def.h
@@ -62,11 +62,6 @@
 
 #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_G0_IRQ_PROPS(grp)     ARM_G0_IRQ_PROPS(grp)
 

diff --git a/plat/arm/css/sgi/include/sgi_plat_config.h b/plat/arm/css/sgi/include/sgi_plat_config.h
index c9ff1fe2335d209bbd84877eb2c06ac7f6064074..9b29d74e4ecfba99ef9054eb3e6c16fec21cca4e 100644 (file)
--- a/plat/arm/css/sgi/include/sgi_plat_config.h
+++ b/plat/arm/css/sgi/include/sgi_plat_config.h
@@ -7,7 +7,6 @@
 #ifndef __SGI_PLAT_CONFIG_H__
 #define __SGI_PLAT_CONFIG_H__
 
-#include <arm_gic.h>
 #include <ccn.h>
 #include <gicv3.h>
 

diff --git a/plat/arm/css/sgi/sgi-common.mk b/plat/arm/css/sgi/sgi-common.mk
index 74d255cba50f78f80e7b9f80e4e2077c7dba88b8..28f97b1f19b9b81148e18ff6306c80cb01be8846 100644 (file)
--- a/plat/arm/css/sgi/sgi-common.mk
+++ b/plat/arm/css/sgi/sgi-common.mk
@@ -6,8 +6,6 @@
 
 CSS_USE_SCMI_SDS_DRIVER                :=      1
 
-ENABLE_PLAT_COMPAT             :=      0
-
 CSS_ENT_BASE                   :=      plat/arm/css/sgi
 
 RAS_EXTENSION                  :=      0

diff --git a/plat/arm/css/sgi/sgi_plat.c b/plat/arm/css/sgi/sgi_plat.c
index 0a7e319dbe7bdffd39deee7d7a6c4aeeff762a8e..710430bb761cf15e7d6ea70b2ebacca266a4fa33 100644 (file)
--- a/plat/arm/css/sgi/sgi_plat.c
+++ b/plat/arm/css/sgi/sgi_plat.c
@@ -65,7 +65,7 @@ const mmap_region_t plat_arm_mmap[] = {
 #if ENABLE_SPM
        ARM_SP_IMAGE_MMAP,
 #endif
-#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2 && !BL2_AT_EL3
+#if TRUSTED_BOARD_BOOT && !BL2_AT_EL3
        ARM_MAP_BL1_RW,
 #endif
        {0}
@@ -148,7 +148,7 @@ const struct secure_partition_boot_info *plat_get_secure_partition_boot_info(
 }
 #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)
 {
        assert(heap_addr != NULL);

diff --git a/plat/arm/css/sgm/include/sgm_plat_config.h b/plat/arm/css/sgm/include/sgm_plat_config.h
index b171d9a68a7f8ea49f8ff7350c046a5a9a85fad3..75abeffb25d5d125f08fbf03c8623044f17a898b 100644 (file)
--- a/plat/arm/css/sgm/include/sgm_plat_config.h
+++ b/plat/arm/css/sgm/include/sgm_plat_config.h
@@ -7,7 +7,6 @@
 #ifndef __SGM_PLAT_CONFIG_H__
 #define __SGM_PLAT_CONFIG_H__
 
-#include <arm_gic.h>
 #include <ccn.h>
 #include <gicv3.h>
 

diff --git a/plat/arm/css/sgm/sgm-common.mk b/plat/arm/css/sgm/sgm-common.mk
index 6a3caba242045e1c553fe081a1e8721753717a87..b10e14cb16b7e13a8adb07cfb93959da339c4135 100644 (file)
--- a/plat/arm/css/sgm/sgm-common.mk
+++ b/plat/arm/css/sgm/sgm-common.mk
@@ -48,9 +48,6 @@ BL31_SOURCES          +=      $(SGM_CPU_SOURCES)                      \
 # sgm uses CCI-500 as Cache Coherent Interconnect
 ARM_CCI_PRODUCT_ID     :=      500
 
-# Disable the PSCI platform compatibility layer
-ENABLE_PLAT_COMPAT     :=      0
-
 # System coherency is managed in hardware
 HW_ASSISTED_COHERENCY  :=      1
 

diff --git a/plat/arm/css/sgm/sgm_mmap_config.c b/plat/arm/css/sgm/sgm_mmap_config.c
index 8a4a8ab037d32fda3e6b1da2c6386f83dc66455b..0f0410995835e9e13a271556528c1bd1dd8b9706 100644 (file)
--- a/plat/arm/css/sgm/sgm_mmap_config.c
+++ b/plat/arm/css/sgm/sgm_mmap_config.c
@@ -43,7 +43,7 @@ const mmap_region_t plat_arm_mmap[] = {
 #ifdef SPD_opteed
        ARM_OPTEE_PAGEABLE_LOAD_MEM,
 #endif
-#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2 && !BL2_AT_EL3
+#if TRUSTED_BOARD_BOOT && !BL2_AT_EL3
        ARM_MAP_BL1_RW,
 #endif
        {0}

diff --git a/plat/arm/css/sgm/sgm_plat_config.c b/plat/arm/css/sgm/sgm_plat_config.c
index 97b16a8f824537a0372b89142c3837b1174325ae..e977e618bca8039357d752338de3c657b158ba41 100644 (file)
--- a/plat/arm/css/sgm/sgm_plat_config.c
+++ b/plat/arm/css/sgm/sgm_plat_config.c
@@ -68,7 +68,7 @@ css_plat_config_t *get_plat_config(void)
        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)
 {
        assert(heap_addr != NULL);