X-Git-Url: http://git.ozo.com/?p=openwrt%2F.git;a=blobdiff_plain;f=target%2Flinux%2Fimx6%2Fconfig-4.14;h=e8df29166957f99d250fc77fe17bda9def2c855f;hp=587cd7522a002c3e8bce26ecf1e244f87ea7417d;hb=d24bac0a95e6e9e2cc93a354d02694ee3780b32c;hpb=076c11a3aa184d031633ef706de0bc55ee186655

diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14
index 587cd7522a..e8df291669 100644
--- a/target/linux/imx6/config-4.14
+++ b/target/linux/imx6/config-4.14
@@ -92,6 +92,7 @@ CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_RMAP=y
+CONFIG_CPU_SPECTRE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
@@ -126,7 +127,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -180,13 +180,13 @@ CONFIG_EXT4_FS_ENCRYPTION=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXTCON=y
+CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
 # CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
-CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FEC=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -316,6 +316,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MICREL_PHY=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_MIGRATION=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_MXC is not set