diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-03-23 19:23:47 +0200 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-03-23 20:30:25 +0200 |
| commit | 890d03ae33a2fa62a1bd577ba54cbf3c945cccef (patch) | |
| tree | 129a054dc9df911b60c555f77b2b8a2f4f64ea3a | |
| parent | 4eb91e6ed41b5b2c7430e7ceb3bb43dce43b4c54 (diff) | |
colibri-imx8qxp: 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>
| -rw-r--r-- | board/toradex/colibri-imx8qxp/colibri-imx8qxp.c | 10 | ||||
| -rw-r--r-- | configs/colibri-imx8qxp_defconfig | 6 | ||||
| -rw-r--r-- | include/configs/colibri-imx8qxp.h | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c index 33365c652a..76229d6b67 100644 --- a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c +++ b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.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> @@ -337,6 +338,15 @@ int board_init(void) (void) pmic_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/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig index b266fc298f..c0861a97b3 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -4,7 +4,11 @@ CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SMC_FUSE=y CONFIG_TARGET_COLIBRI_IMX8QXP=y +CONFIG_SNVS_SEC_SC=y CONFIG_IMX_BOOTAUX=y +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 +CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y @@ -36,7 +40,7 @@ CONFIG_DM_GPIO=y CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_IMX_LPI2C=y -CONFIG_MISC=y +CONFIG_SYS_I2C_IMX_VIRT_I2C=y CONFIG_DM_MMC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index 0d40042b8e..5ab3a418c2 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-imx8qxp.h @@ -190,7 +190,5 @@ #endif #define CONFIG_OF_SYSTEM_SETUP -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ #endif /* __COLIBRI_IMX8QXP_H */ |