From 2b395c298247da0f2a313bad711d63f9463b50cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Mon, 28 Mar 2022 14:31:55 +0200 Subject: [PATCH] imx: update config for 5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Refresh kernel config with `make kernel_oldconfig` make target. Signed-off-by: Petr Å tetiar --- target/linux/imx/config-5.15 | 27 ++++++++++++++++++------ target/linux/imx/cortexa7/config-default | 1 + target/linux/imx/cortexa9/config-default | 2 -- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/target/linux/imx/config-5.15 b/target/linux/imx/config-5.15 index 006de90620b7..44c02eccbced 100644 --- a/target/linux/imx/config-5.15 +++ b/target/linux/imx/config-5.15 @@ -1,3 +1,4 @@ +CONFIG_AF_UNIX_OOB=y CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y @@ -15,8 +16,6 @@ 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_CRYPTO=y CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_764369=y @@ -38,12 +37,11 @@ CONFIG_ATA=y CONFIG_ATAGS=y # CONFIG_ATA_SFF is not set CONFIG_AUTO_ZRELADDR=y +CONFIG_BINARY_PRINTF=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_PM=y -CONFIG_BLK_SCSI_REQUEST=y CONFIG_CACHE_L2X0=y -CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_IMX_GPT=y CONFIG_CLKSRC_MMIO=y # CONFIG_CLK_IMX8MM is not set @@ -164,11 +162,15 @@ CONFIG_F2FS_FS=y # CONFIG_FEC is not set CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y +# CONFIG_FSL_DPAA2_SWITCH is not set +# CONFIG_FSL_ENETC_IERB is not set +# CONFIG_FSL_IMX8_DDR_PMU is not set CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y +CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y @@ -176,6 +178,7 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IDLE_POLL_SETUP=y @@ -183,6 +186,7 @@ CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCTRL_GROUPS=y @@ -197,7 +201,6 @@ CONFIG_GENERIC_VDSO_32=y CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIO_CDEV=y -# CONFIG_GPIO_CDEV_V1 is not set CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MXC=y CONFIG_GRO_CELLS=y @@ -217,6 +220,8 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_IMX=y # CONFIG_I2C_IMX_LPI2C is not set +CONFIG_I2C_SLAVE=y +# CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_IMX2_WDT=y # CONFIG_IMX7ULP_WDT is not set # CONFIG_IMX8MM_THERMAL is not set @@ -240,6 +245,7 @@ CONFIG_KEYS=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_LTO_NONE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MDIO_BUS=y @@ -276,9 +282,12 @@ CONFIG_NEON=y CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_DSA_COMMON=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NET_SELFTESTS=y +CONFIG_NET_SOCK_MSG=y CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y @@ -296,7 +305,6 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y -CONFIG_OF_NET=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y @@ -312,12 +320,14 @@ CONFIG_PINCTRL=y # CONFIG_PINCTRL_IMX8MN is not set # CONFIG_PINCTRL_IMX8MP is not set # CONFIG_PINCTRL_IMX8MQ is not set +# CONFIG_PINCTRL_IMX8ULP is not set CONFIG_PL310_ERRATA_769419=y CONFIG_PM=y CONFIG_PM_CLK=y CONFIG_PM_OPP=y CONFIG_PPS=y CONFIG_PTP_1588_CLOCK=y +CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_PWM=y # CONFIG_PWM_IMX1 is not set CONFIG_PWM_IMX27=y @@ -344,6 +354,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SCSI=y +CONFIG_SCSI_COMMON=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -353,6 +364,9 @@ CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y +# CONFIG_SND_SOC_IMX_CARD is not set +# CONFIG_SND_SOC_IMX_HDMI is not set +CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SOC_BUS=y # CONFIG_SOC_IMX50 is not set # CONFIG_SOC_IMX51 is not set @@ -403,7 +417,6 @@ CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_COMMON=y 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_MXS_PHY=y CONFIG_USB_OTG=y diff --git a/target/linux/imx/cortexa7/config-default b/target/linux/imx/cortexa7/config-default index b91c01cd5616..480e98867f4b 100644 --- a/target/linux/imx/cortexa7/config-default +++ b/target/linux/imx/cortexa7/config-default @@ -5,6 +5,7 @@ CONFIG_CMA=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CONTIG_ALLOC=y # CONFIG_DMA_CMA is not set CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y diff --git a/target/linux/imx/cortexa9/config-default b/target/linux/imx/cortexa9/config-default index 3136def5bfd8..d829bc7741b6 100644 --- a/target/linux/imx/cortexa9/config-default +++ b/target/linux/imx/cortexa9/config-default @@ -26,9 +26,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_OF_ESDHC=y # CONFIG_MMC_SDHCI_PCI is not set -# CONFIG_NET_DSA_MSCC_FELIX is not set CONFIG_NET_DSA_MV88E6XXX=y -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_PCI=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y -- 2.30.2