From e55aedf8ec36f624ad66a8dd033cbccc7e661faf Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 4 Apr 2021 15:54:17 -0500 Subject: [PATCH 5/8] allwinner: Clean up some platform definitions Group the SCP base/size definitions in a more logical location. Signed-off-by: Samuel Holland Change-Id: Id43f9b468d7d855a2413173d674a5ee666527808 --- plat/allwinner/common/include/platform_def.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plat/allwinner/common/include/platform_def.h b/plat/allwinner/common/include/platform_def.h index de44174b2..56a2ad6f7 100644 --- a/plat/allwinner/common/include/platform_def.h +++ b/plat/allwinner/common/include/platform_def.h @@ -13,9 +13,6 @@ #include -/* The SCP firmware is allocated the last 16KiB of SRAM A2. */ -#define SUNXI_SCP_SIZE 0x4000 - #ifdef SUNXI_BL31_IN_DRAM #define BL31_BASE SUNXI_DRAM_BASE @@ -31,7 +28,6 @@ #define BL31_BASE (SUNXI_SRAM_A2_BASE + 0x4000) #define BL31_LIMIT (SUNXI_SRAM_A2_BASE + \ SUNXI_SRAM_A2_SIZE - SUNXI_SCP_SIZE) -#define SUNXI_SCP_BASE BL31_LIMIT /* Overwrite U-Boot SPL, but reserve the first page for the SPL header. */ #define BL31_NOBITS_BASE (SUNXI_SRAM_A1_BASE + 0x1000) @@ -42,6 +38,10 @@ #define SUNXI_BL33_VIRT_BASE SUNXI_DRAM_VIRT_BASE +/* The SCP firmware is allocated the last 16KiB of SRAM A2. */ +#define SUNXI_SCP_BASE BL31_LIMIT +#define SUNXI_SCP_SIZE 0x4000 + #endif /* SUNXI_BL31_IN_DRAM */ /* How much DRAM to map (to map BL33, for fetching the DTB from U-Boot) */ -- 2.31.1