linux-toradex-mainline: imx 32bit: use a common defconfig and enable can_j1939

Use the common defconfig from the kernel sources toradex-imx_v6_v7_defconfig.
This increases the kernel size for the so far smallest kernel by about 200k.
We need a file for each machine as we do not have a common override to use
in the use-mainline-bsp case.

This additionally adds CAN_J1939 as a kernel module.

Related-to: ELB-3023
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

1 files changed, 24 insertions, 10 deletions

diff --git a/recipes-kernel/linux/linux-toradex-mainline-5.4/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-mainline-5.4/apalis-imx6/defconfig
index ac33e53..7089f0a 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-5.4/apalis-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-mainline-5.4/apalis-imx6/defconfig
@@ -3,6 +3,7 @@ CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@@ -29,6 +30,7 @@ CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_SLUB_DEBUG is not set
@@ -36,8 +38,11 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_MXC=y
 CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX7D=y
 CONFIG_CACHE_L2X0_PMU=y
 CONFIG_SMP=y
+CONFIG_ARM_PSCI=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_THUMB2_KERNEL=y
 CONFIG_HIGHMEM=y
@@ -56,6 +61,9 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_CPU_IDLE=y
+CONFIG_ARM_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE=y
+
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -264,6 +272,7 @@ CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
+CONFIG_CAN_J1939=m
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_MCP251X=m
 CONFIG_BT=y
@@ -326,8 +335,9 @@ CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
 CONFIG_MTD_SST25L=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_FASTMAP=y
@@ -476,6 +486,7 @@ CONFIG_KEYBOARD_IMX=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_EGALAX=y
 CONFIG_TOUCHSCREEN_MAX11801=y
@@ -578,17 +589,20 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_CPU_THERMAL=y
 CONFIG_IMX_THERMAL=y
 CONFIG_WATCHDOG=y
+CONFIG_RN5T618_WATCHDOG=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9062=y
 CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
+CONFIG_MFD_RN5T618=y
 CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_PFUZE100=y
+CONFIG_REGULATOR_RN5T618=y
 CONFIG_RC_CORE=y
 CONFIG_RC_DEVICES=y
 CONFIG_IR_GPIO_CIR=y
@@ -656,6 +670,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_MUX=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_IMX_PXP=m
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_OV5640=m
@@ -792,12 +807,15 @@ CONFIG_USB_CONFIGFS_F_UVC=y
 CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
 CONFIG_USB_ETH=m
+CONFIG_USB_ETH_EEM=y
 CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_SDHCI=y
@@ -832,6 +850,7 @@ CONFIG_RTC_DRV_MXC_V2=y
 CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=m
+CONFIG_MXS_DMA=y
 CONFIG_DW_DMAC=y
 CONFIG_DW_DMAC_PCI=y
 CONFIG_DMATEST=m
@@ -863,6 +882,7 @@ CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
 CONFIG_AD7923=m
+CONFIG_IMX7D_ADC=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
@@ -941,6 +961,7 @@ CONFIG_T5403=m
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
 CONFIG_PWM=y
+CONFIG_PWM_FSL_FTM=y
 CONFIG_PWM_IMX27=y
 CONFIG_NVMEM_IMX_OCOTP=y
 CONFIG_TEE=y
@@ -1043,16 +1064,9 @@ CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_CORESIGHT=y
-CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
-CONFIG_CORESIGHT_CATU=y
-CONFIG_CORESIGHT_SINK_TPIU=y
-CONFIG_CORESIGHT_SINK_ETBV10=y
-CONFIG_CORESIGHT_SOURCE_ETM3X=y
-CONFIG_CORESIGHT_STM=y
-CONFIG_CORESIGHT_CPU_DEBUG=m
+