From 4653dcf81b930bff4430dc20e183f4c1225f71da Mon Sep 17 00:00:00 2001
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Date: Mon, 23 Mar 2020 20:22:02 +0200
Subject: apalis-imx8x: sync with MEK platform

1. Enable CONFIG_SNVS_SEC_SC_AUTO by default
2. Move BOOTAUX_* defines to defconfig

Related-to: ELB-2605
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
 board/toradex/apalis-imx8x/apalis-imx8x.c | 9 +++++++++
 configs/apalis-imx8x_defconfig            | 3 +++
 include/configs/apalis-imx8x.h            | 2 --
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/board/toradex/apalis-imx8x/apalis-imx8x.c b/board/toradex/apalis-imx8x/apalis-imx8x.c
index ddc34054b6..aff6b6466c 100644
--- a/board/toradex/apalis-imx8x/apalis-imx8x.c
+++ b/board/toradex/apalis-imx8x/apalis-imx8x.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
+#include <asm/arch/snvs_security_sc.h>
 #include <dm.h>
 #include <imx8_hsio.h>
 #include <usb.h>
@@ -323,6 +324,14 @@ int board_init(void)
 	board_gpio_init();
 #endif
 
+#ifdef CONFIG_SNVS_SEC_SC_AUTO
+	{
+		int ret = snvs_security_sc_init();
+
+		if (ret)
+			return ret;
+	}
+#endif
 	return 0;
 }
 
diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig
index ad6de0b757..bfed0375a0 100644
--- a/configs/apalis-imx8x_defconfig
+++ b/configs/apalis-imx8x_defconfig
@@ -4,7 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SMC_FUSE=y
 CONFIG_TARGET_APALIS_IMX8QXP=y
+CONFIG_SNVS_SEC_SC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
+CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-apalis"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index 0d2cdb74bf..8c692abdf0 100644
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -193,7 +193,5 @@
 #endif
 
 #define CONFIG_OF_SYSTEM_SETUP
-#define BOOTAUX_RESERVED_MEM_BASE 0x88000000
-#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */
 
 #endif /* __APALIS_IMX8QXP_H */
-- 
cgit v1.2.3