From: Piotr Dymacz Date: Sun, 28 Mar 2021 14:46:21 +0000 (+0200) Subject: imx6: refresh and update target kernel configs X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7abde5037d572cb28cc8ae41b39c76323eebc4a6;p=openwrt%2Fstaging%2Fnbd.git imx6: refresh and update target kernel configs This is a minor extension of the commit 26ae69fd03 ("imx6: refresh kernel config with 5.10 symbols"), with correct and full disable of the Arm Cortex-A7 based i.MX 6UL and 6UL{L,Z} families support and re-enable of the Cortex-A9 based i.MX 6L{S,X}. Signed-off-by: Piotr Dymacz --- diff --git a/target/linux/imx6/config-5.10 b/target/linux/imx6/config-5.10 index 126652cf98..73ce01ebdd 100644 --- a/target/linux/imx6/config-5.10 +++ b/target/linux/imx6/config-5.10 @@ -16,6 +16,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM=y +CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_CRYPTO=y @@ -50,9 +51,8 @@ CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_IMX_GPT=y CONFIG_CLKSRC_MMIO=y CONFIG_CLK_IMX6Q=y -# CONFIG_CLK_IMX6SL is not set -# CONFIG_CLK_IMX6SX is not set -# CONFIG_CLK_IMX6UL is not set +CONFIG_CLK_IMX6SL=y +CONFIG_CLK_IMX6SX=y # CONFIG_CLK_IMX8MM is not set # CONFIG_CLK_IMX8MN is not set # CONFIG_CLK_IMX8MP is not set @@ -93,13 +93,8 @@ CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y CONFIG_CRC16=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AES_ARM=y CONFIG_CRYPTO_AES_ARM_BS=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_CBC=y @@ -109,7 +104,6 @@ CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32_ARM_CE=y CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEV_FSL_CAAM=y @@ -129,8 +123,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ENGINE=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y @@ -139,11 +132,7 @@ CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_NULL2=y -# CONFIG_CRYPTO_POLY1305_ARM is not set CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y @@ -187,7 +176,6 @@ CONFIG_F2FS_FS=y CONFIG_FEC=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y -# CONFIG_FSL_IMX8_DDR_PMU is not set CONFIG_FSL_GUTS=y CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y @@ -236,7 +224,6 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_SMP=y CONFIG_HWMON=y CONFIG_HW_RANDOM=y @@ -278,6 +265,7 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_MARVELL_PHY=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_DEVRES=y CONFIG_MEMFD_CREATE=y CONFIG_MFD_SYSCON=y CONFIG_MICREL_PHY=y @@ -363,7 +351,6 @@ CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX6Q=y CONFIG_PINCTRL_IMX6SL=y CONFIG_PINCTRL_IMX6SX=y -CONFIG_PINCTRL_IMX6UL=y # CONFIG_PINCTRL_IMX8MM is not set # CONFIG_PINCTRL_IMX8MN is not set # CONFIG_PINCTRL_IMX8MP is not set @@ -428,7 +415,7 @@ CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y # CONFIG_SOC_IMX6SLL is not set CONFIG_SOC_IMX6SX=y -CONFIG_SOC_IMX6UL=y +# CONFIG_SOC_IMX6UL is not set # CONFIG_SOC_IMX7D is not set # CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_IMX8M is not set diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4 index 8bfc21a282..6f5142b012 100644 --- a/target/linux/imx6/config-5.4 +++ b/target/linux/imx6/config-5.4 @@ -90,6 +90,7 @@ CONFIG_CRYPTO_AES_ARM=y CONFIG_CRYPTO_AES_ARM_BS=y CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CHACHA20=y @@ -123,6 +124,7 @@ CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y @@ -338,7 +340,6 @@ CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX6Q=y CONFIG_PINCTRL_IMX6SL=y CONFIG_PINCTRL_IMX6SX=y -CONFIG_PINCTRL_IMX6UL=y CONFIG_PL310_ERRATA_769419=y CONFIG_PM=y CONFIG_PM_CLK=y @@ -399,7 +400,7 @@ CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y # CONFIG_SOC_IMX6SLL is not set CONFIG_SOC_IMX6SX=y -CONFIG_SOC_IMX6UL=y +# CONFIG_SOC_IMX6UL is not set # CONFIG_SOC_IMX7D is not set # CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_LS1021A is not set