mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-06-04 07:44:59 +02:00
80 lines
3.3 KiB
Diff
80 lines
3.3 KiB
Diff
From 3a36f70ba02e88ed20083c1278a739c6c870aae0 Mon Sep 17 00:00:00 2001
|
|
From: Jacky Bai <ping.bai@nxp.com>
|
|
Date: Tue, 14 Jan 2020 16:05:59 +0800
|
|
Subject: [PATCH] fix(imx8mq): fix imx8mq build break due to hab
|
|
|
|
Add the HAB secure boot support for the i.MX8MQ to
|
|
fix the build break.
|
|
|
|
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
|
|
Change-Id: I806de2dc42806e008355cc185065e774570362f0
|
|
---
|
|
plat/imx/common/include/imx_sip_svc.h | 2 ++
|
|
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 2 ++
|
|
plat/imx/imx8m/imx8mq/include/platform_def.h | 7 +++++--
|
|
plat/imx/imx8m/imx8mq/platform.mk | 1 +
|
|
4 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h
|
|
index 404a829593..ecb43c3673 100644
|
|
--- a/plat/imx/common/include/imx_sip_svc.h
|
|
+++ b/plat/imx/common/include/imx_sip_svc.h
|
|
@@ -72,6 +72,8 @@ static inline int dram_dvfs_handler(uint32_t smc_fid, void *handle,
|
|
SMC_RET1(handle, SMC_UNK);
|
|
}
|
|
#endif
|
|
+int imx_hab_handler(uint32_t smc_fid, u_register_t x1,
|
|
+ u_register_t x2, u_register_t x3, u_register_t x4);
|
|
#endif
|
|
#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp)
|
|
int dram_dvfs_handler(uint32_t smc_fid, void *handle,
|
|
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
|
|
index 70c2def7d1..735f5dba4f 100644
|
|
--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
|
|
+++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
|
|
@@ -52,6 +52,8 @@ static const mmap_region_t imx_mmap[] = {
|
|
MAP_REGION_FLAT(IMX_GIC_BASE, IMX_GIC_SIZE, MT_DEVICE | MT_RW), /* GIC map */
|
|
MAP_REGION_FLAT(IMX_DDRPHY_BASE, IMX_DDR_IPS_SIZE, MT_DEVICE | MT_RW), /* DDRMIX map */
|
|
MAP_REGION_FLAT(IMX_DRAM_BASE, IMX_DRAM_SIZE, MT_MEMORY | MT_RW | MT_NS),
|
|
+ MAP_REGION_FLAT(IMX_CAAM_RAM_BASE, IMX_CAAM_RAM_SIZE, MT_MEMORY | MT_RW), /* CAMM RAM */
|
|
+ MAP_REGION_FLAT(IMX_NS_OCRAM_BASE, IMX_NS_OCRAM_SIZE, MT_MEMORY | MT_RW), /* NS OCRAM */
|
|
{0},
|
|
};
|
|
|
|
diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
|
|
index 61c0e8e46e..c8289894b8 100644
|
|
--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
|
|
+++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
|
|
@@ -10,7 +10,7 @@
|
|
#define PLATFORM_LINKER_FORMAT "elf64-littleaarch64"
|
|
#define PLATFORM_LINKER_ARCH aarch64
|
|
|
|
-#define PLATFORM_STACK_SIZE 0x800
|
|
+#define PLATFORM_STACK_SIZE 0xb00
|
|
#define CACHE_WRITEBACK_GRANULE 64
|
|
|
|
#define PLAT_PRIMARY_CPU U(0x0)
|
|
@@ -93,7 +93,10 @@
|
|
#define IMX_DDR_IPS_SIZE U(0x1800000)
|
|
#define IMX_DRAM_BASE U(0x40000000)
|
|
#define IMX_DRAM_SIZE U(0xc0000000)
|
|
-
|
|
+#define IMX_NS_OCRAM_BASE U(0x900000)
|
|
+#define IMX_NS_OCRAM_SIZE U(0x20000)
|
|
+#define IMX_CAAM_RAM_BASE U(0x100000)
|
|
+#define IMX_CAAM_RAM_SIZE U(0x10000)
|
|
#define IMX_ROM_BASE U(0x00000000)
|
|
#define IMX_ROM_SIZE U(0x20000)
|
|
|
|
diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
|
|
index 73179dd0c1..d3d213268c 100644
|
|
--- a/plat/imx/imx8m/imx8mq/platform.mk
|
|
+++ b/plat/imx/imx8m/imx8mq/platform.mk
|
|
@@ -29,6 +29,7 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
|
|
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c \
|
|
plat/imx/imx8m/imx8mq/imx8mq_psci.c \
|
|
plat/imx/imx8m/gpc_common.c \
|
|
+ plat/imx/imx8m/imx_hab.c \
|
|
plat/imx/imx8m/imx_aipstz.c \
|
|
plat/imx/imx8m/imx8m_caam.c \
|
|
plat/imx/imx8m/imx8m_ccm.c \
|