From 0b24f49be966839d3d28e9b48296a2e32b503e2d Mon Sep 17 00:00:00 2001
From: Franck LENORMAND <franck.lenormand@nxp.com>
Date: Thu, 23 Apr 2020 11:12:09 +0200
Subject: [PATCH] MLK-23834: Add snvs_security to 8dxl

Add the support for the snvs_security module on all 8dxl
SoC.

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
(cherry picked from commit b928877399a6ca3d0ff0af5c9c136f8dee3f150d)
(cherry picked from commit 7a1e94feef7b746b8d58d090a7a8edd55c472946)
(cherry picked from commit 4bfc235589283d0950a6e42c3ab867773db5c2a9)
---
 board/freescale/imx8dxl_evk/imx8dxl_evk.c              | 10 ++++++++++
 .../imx8dxl_phantom_mek/imx8dxl_phantom_mek.c          | 10 ++++++++++
 configs/imx8dxl_ddr3_evk_defconfig                     |  1 +
 configs/imx8dxl_ddr3_evk_nand_defconfig                |  1 +
 configs/imx8dxl_evk_defconfig                          |  1 +
 configs/imx8dxl_evk_fspi_defconfig                     |  1 +
 configs/imx8dxl_phantom_mek_defconfig                  |  1 +
 configs/imx8dxl_phantom_mek_fspi_defconfig             |  1 +
 8 files changed, 26 insertions(+)

diff --git a/board/freescale/imx8dxl_evk/imx8dxl_evk.c b/board/freescale/imx8dxl_evk/imx8dxl_evk.c
index 3f6e933f8b..9ce1948f30 100644
--- a/board/freescale/imx8dxl_evk/imx8dxl_evk.c
+++ b/board/freescale/imx8dxl_evk/imx8dxl_evk.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
+#include <asm/arch/snvs_security_sc.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <usb.h>
@@ -161,6 +162,15 @@ int board_init(void)
 	setup_eqos();
 #endif
 
+#ifdef CONFIG_IMX_SNVS_SEC_SC_AUTO
+	{
+		int ret = snvs_security_sc_init();
+
+		if (ret)
+			return ret;
+	}
+#endif
+
 	return 0;
 }
 
diff --git a/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c b/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
index b267442e04..8976689f59 100644
--- a/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
+++ b/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
+#include <asm/arch/snvs_security_sc.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <usb.h>
@@ -133,6 +134,15 @@ int board_init(void)
 {
 	board_gpio_init();
 
+#ifdef CONFIG_IMX_SNVS_SEC_SC_AUTO
+	{
+		int ret = snvs_security_sc_init();
+
+		if (ret)
+			return ret;
+	}
+#endif
+
 	return 0;
 }
 
diff --git a/configs/imx8dxl_ddr3_evk_defconfig b/configs/imx8dxl_ddr3_evk_defconfig
index ddbaae78d8..9f1f56bf9b 100644
--- a/configs/imx8dxl_ddr3_evk_defconfig
+++ b/configs/imx8dxl_ddr3_evk_defconfig
@@ -156,3 +156,4 @@ CONFIG_SDP_LOADADDR=0x80400000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
+CONFIG_IMX_SNVS_SEC_SC=y
diff --git a/configs/imx8dxl_ddr3_evk_nand_defconfig b/configs/imx8dxl_ddr3_evk_nand_defconfig
index 9f2c5adcec..2bebc25ef1 100644
--- a/configs/imx8dxl_ddr3_evk_nand_defconfig
+++ b/configs/imx8dxl_ddr3_evk_nand_defconfig
@@ -165,3 +165,4 @@ CONFIG_SDP_LOADADDR=0x80400000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
+CONFIG_IMX_SNVS_SEC_SC=y
diff --git a/configs/imx8dxl_evk_defconfig b/configs/imx8dxl_evk_defconfig
index c31f3491d9..0b8869842f 100644
--- a/configs/imx8dxl_evk_defconfig
+++ b/configs/imx8dxl_evk_defconfig
@@ -158,3 +158,4 @@ CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_SNVS_SEC_SC=y
diff --git a/configs/imx8dxl_evk_fspi_defconfig b/configs/imx8dxl_evk_fspi_defconfig
index 48df38424a..10f89b3415 100644
--- a/configs/imx8dxl_evk_fspi_defconfig
+++ b/configs/imx8dxl_evk_fspi_defconfig
@@ -163,3 +163,4 @@ CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_SNVS_SEC_SC=y
diff --git a/configs/imx8dxl_phantom_mek_defconfig b/configs/imx8dxl_phantom_mek_defconfig
index 50c8b23b96..e5cac84170 100644
--- a/configs/imx8dxl_phantom_mek_defconfig
+++ b/configs/imx8dxl_phantom_mek_defconfig
@@ -159,3 +159,4 @@ CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_SNVS_SEC_SC=y
diff --git a/configs/imx8dxl_phantom_mek_fspi_defconfig b/configs/imx8dxl_phantom_mek_fspi_defconfig
index 0bce1212e6..baa535c941 100644
--- a/configs/imx8dxl_phantom_mek_fspi_defconfig
+++ b/configs/imx8dxl_phantom_mek_fspi_defconfig
@@ -165,3 +165,4 @@ CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_SNVS_SEC_SC=y
-- 
2.17.1