diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-21 14:56:13 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-22 18:14:28 +0100 |
| commit | d24bac0a95e6e9e2cc93a354d02694ee3780b32c (patch) | |
| tree | 0eac2a2fdc2010a21717c526244155d7b5ba9323 /target/linux/imx6 | |
| parent | 076c11a3aa184d031633ef706de0bc55ee186655 (diff) | |
| download | upstream-d24bac0a95e6e9e2cc93a354d02694ee3780b32c.tar.gz upstream-d24bac0a95e6e9e2cc93a354d02694ee3780b32c.tar.bz2 upstream-d24bac0a95e6e9e2cc93a354d02694ee3780b32c.zip | |
imx6: refresh kernel configs
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/imx6')
| -rw-r--r-- | target/linux/imx6/config-4.14 | 7 | ||||
| -rw-r--r-- | target/linux/imx6/config-4.19 | 3 |
2 files changed, 5 insertions, 5 deletions
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 diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19 index 3d03402a75..8212cf6523 100644 --- a/target/linux/imx6/config-4.19 +++ b/target/linux/imx6/config-4.19 @@ -295,6 +295,7 @@ CONFIG_IMX_DMA=y CONFIG_IMX_SDMA=y CONFIG_IMX_THERMAL=y # CONFIG_IMX_WEIM is not set +# CONFIG_INITRAMFS_FORCE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y @@ -507,11 +508,9 @@ CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_EHCI_MXC is not set CONFIG_USB_GADGET=y -# CONFIG_USB_IMX21_HCD is not set CONFIG_USB_MXS_PHY=y CONFIG_USB_OTG=y CONFIG_USB_PHY=y -# CONFIG_USB_ROLE_SWITCH is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=y CONFIG_USE_OF=y |