Message ID | 20190106210049.30918-9-stefan@agner.ch |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
Series | arm: Colibri iMX7 fixes and DM_MMC conversion | expand |
On Sun, 2019-01-06 at 22:00 +0100, Stefan Agner wrote: > From: Stefan Agner <stefan.agner@toradex.com> > > Access to CAAM in non-secure mode must be enabled by the boot > loader first. The U-Boot CAAM driver enables access to CAAM in > non-secure mode by default. Hence enable the CAAM driver to > allow Linux accessing CAAM directly. This prevents error > messages like the following on Linux boot: > caam 30900000.caam: Entropy delay = 3200 > caam 30900000.caam: failed to acquire DECO 0 > caam 30900000.caam: failed to instantiate RNG While I noticed that I did not (yet) look closer into it. Good catch. > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > configs/colibri_imx7_defconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/configs/colibri_imx7_defconfig > b/configs/colibri_imx7_defconfig > index af976bab12..c6fd7f3f4e 100644 > --- a/configs/colibri_imx7_defconfig > +++ b/configs/colibri_imx7_defconfig > @@ -2,9 +2,11 @@ CONFIG_ARM=y > CONFIG_SYS_THUMB_BUILD=y > CONFIG_ARCH_MX7=y > CONFIG_SYS_TEXT_BASE=0x87800000 > +CONFIG_SECURE_BOOT=y > CONFIG_TARGET_COLIBRI_IMX7=y > CONFIG_IMX_RDC=y > CONFIG_IMX_BOOTAUX=y > +# CONFIG_CMD_DEKBLOB is not set > CONFIG_ENV_VARS_UBOOT_CONFIG=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imxi > mage.cfg,MX7D" > @@ -35,6 +37,7 @@ CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > CONFIG_CMD_BMP=y > CONFIG_CMD_CACHE=y > +# CONFIG_CMD_HASH is not set > CONFIG_CMD_EXT4=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > @@ -46,6 +49,7 @@ CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand" > CONFIG_ENV_IS_IN_NAND=y > CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y > +CONFIG_FSL_CAAM=y > CONFIG_DFU_MMC=y > CONFIG_DM_GPIO=y > CONFIG_DM_I2C=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index af976bab12..c6fd7f3f4e 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -2,9 +2,11 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX7=y CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_SECURE_BOOT=y CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +# CONFIG_CMD_DEKBLOB is not set CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" @@ -35,6 +37,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y +# CONFIG_CMD_HASH is not set CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y @@ -46,6 +49,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand" CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_FSL_CAAM=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y