layerscape: sync with upstream

target/linux/layerscape/Makefile

@@ -6,7 +6,8 @@ include $(TOPDIR)/rules.mk
 
 BOARD:=layerscape
 BOARDNAME:=NXP Layerscape
-KERNEL_PATCHVER:=5.4
+KERNEL_PATCHVER:=5.10
+KERNEL_TESTING_PATCHVER:=5.15
 FEATURES:=squashfs nand usb pcie gpio fpu ubifs ext4 rootfs-part boot-part
 SUBTARGETS:=armv8_64b armv7
 

target/linux/layerscape/armv7/config-5.4 → target/linux/layerscape/armv7/config-5.10

@@ -5,7 +5,6 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_APDS9802ALS=y
 CONFIG_AQUANTIA_PHY=y
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
@@ -17,6 +16,8 @@ CONFIG_ARCH_MXC=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -38,6 +39,8 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_HEAVY_MB=y
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
@@ -51,8 +54,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
-CONFIG_AT803X_PHY=y
-# CONFIG_AT803X_PHY_SMART_EEE is not set
 CONFIG_ATAGS=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
@@ -72,7 +73,6 @@ CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BLK_SCSI_REQUEST=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_BOUNCE=y
 CONFIG_BRCMSTB_GISB_ARB=y
@@ -84,6 +84,10 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_MMIO=y
+# CONFIG_CLK_IMX8MM is not set
+# CONFIG_CLK_IMX8MN is not set
+# CONFIG_CLK_IMX8MP is not set
+# CONFIG_CLK_IMX8MQ is not set
 CONFIG_CLK_QORIQ=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMA=y
@@ -143,21 +147,14 @@ CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG2=y
-# CONFIG_CRYPTO_TLS is not set
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_ALIGN_RODATA=y
@@ -168,21 +165,18 @@ CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
 # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
 # CONFIG_DEVFREQ_THERMAL is not set
-# CONFIG_DEVICE_THERMAL is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_CMA=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
+CONFIG_DMA_OPS=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
@@ -213,21 +207,19 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_FREEZER=y
 CONFIG_FSL_EDMA=y
-# CONFIG_FSL_EDMA_V3 is not set
 CONFIG_FSL_GUTS=y
 CONFIG_FSL_IFC=y
 # CONFIG_FSL_PPFE is not set
 CONFIG_FSL_PQ_MDIO=y
-# CONFIG_FSL_QIXIS is not set
 CONFIG_FSL_RCPM=y
-# CONFIG_FSL_SDK_DPA is not set
 CONFIG_FSL_XGMAC_MDIO=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FTRACE=y
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_FUSE_FS=y
+CONFIG_FW_CACHE=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_GENERIC_ALLOCATOR=y
@@ -236,7 +228,9 @@ 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
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
@@ -256,9 +250,9 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_VDSO_32=y
 CONFIG_GIANFAR=y
 CONFIG_GLOB=y
-CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MPC8XXX=y
@@ -278,7 +272,6 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_IMX_RNGC=y
 CONFIG_HZ_FIXED=0
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -287,7 +280,6 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_DEMUX_PINCTRL=y
 CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_IMX=y
 # CONFIG_I2C_IMX_LPI2C is not set
@@ -297,22 +289,21 @@ CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_RK3X=y
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=y
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
 CONFIG_I2C_XILINX=y
 CONFIG_ICPLUS_PHY=y
 CONFIG_ICS932S401=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_IMX2_WDT=y
 # CONFIG_IMX7ULP_WDT is not set
+# CONFIG_IMX8MM_THERMAL is not set
 CONFIG_IMX_DMA=y
 # CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+CONFIG_IMX_INTMUX=y
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_SDMA=y
 # CONFIG_IMX_WEIM is not set
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INPHI_PHY is not set
 CONFIG_INPUT=y
-# CONFIG_INPUT_MISC is not set
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
@@ -325,9 +316,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 # CONFIG_ISDN is not set
 CONFIG_ISL29003=y
-# CONFIG_IVSHMEM_NET is not set
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
+CONFIG_KCMP=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
@@ -336,6 +327,7 @@ CONFIG_LIBFDT=y
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_LS_EXTIRQ=y
 CONFIG_LS_SCFG_MSI=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
@@ -346,10 +338,12 @@ CONFIG_MCPM=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
 # CONFIG_MDIO_GPIO is not set
 CONFIG_MEMFD_CREATE=y
 CONFIG_MEMORY=y
 CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MFD_HI6421_SPMI is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_VEXPRESS_SYSREG is not set
 CONFIG_MICREL_PHY=y
@@ -376,6 +370,7 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 CONFIG_MTD_NAND_FSL_IFC=y
 CONFIG_MTD_PHYSMAP=y
@@ -413,6 +408,7 @@ CONFIG_NTFS_FS=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_IMX_IIM is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
+# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
@@ -437,7 +433,6 @@ CONFIG_PANIC_TIMEOUT=0
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 # CONFIG_PCIEASPM_POWERSAVE is not set
@@ -461,6 +456,10 @@ CONFIG_PHYLIB=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PID_NS=y
 CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_IMX8MM is not set
+# CONFIG_PINCTRL_IMX8MN is not set
+# CONFIG_PINCTRL_IMX8MP is not set
+# CONFIG_PINCTRL_IMX8MQ is not set
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_753970=y
@@ -486,28 +485,18 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PROC_CHILDREN=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_842_COMPRESS is not set
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZO_COMPRESS is not set
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_QORIQ=y
 CONFIG_QORIQ_CPUFREQ=y
-# CONFIG_QUICC_ENGINE is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_EXPERT is not set
-CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_RCU_STALL_COMMON=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y
@@ -517,7 +506,6 @@ CONFIG_REALTEK_PHY=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
@@ -558,6 +546,7 @@ CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_EARLYCON=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_ST_ASC=y
@@ -583,6 +572,7 @@ CONFIG_SOC_BUS=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
 CONFIG_SOC_LS1021A=y
 # CONFIG_SOC_VF610 is not set
 CONFIG_SPARSE_IRQ=y
@@ -598,6 +588,7 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPI_XILINX=y
 CONFIG_SPMI=y
+# CONFIG_SPMI_HISI3670 is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -630,7 +621,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
-# CONFIG_TSN is not set
 CONFIG_UBIFS_FS=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UEVENT_HELPER_PATH=""
@@ -642,7 +632,6 @@ CONFIG_USER_NS=y
 CONFIG_USE_OF=y
 CONFIG_UTS_NS=y
 CONFIG_VEXPRESS_CONFIG=y
-CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_VFAT_FS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y