From d05f61e45f3c0e111783c7f9d4ae039b88cf5da0 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 26 Dec 2019 01:05:15 +0100 Subject: apalis/colibri_imx6/-imx6ull/mx7/mx8: defconfig: resync with kernel defconfig Resync with the defconfigs from the kernel repository. This adds: - fix ip firewall (bpf/cgroup) - Revert "arm64: defconfig: Choose the newer version of the ov5640 driver" Signed-off-by: Marcel Ziswiler --- recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig | 2 ++ recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig | 2 ++ recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig | 2 ++ recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig | 2 ++ recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx8/defconfig | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig index f073b16..f8776ba 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig @@ -9,10 +9,12 @@ CONFIG_CGROUPS=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_BPF=y CONFIG_CGROUP_DEBUG=y CONFIG_NAMESPACES=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y +CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig index ee7d265..7aacece 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig @@ -9,10 +9,12 @@ CONFIG_CGROUPS=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_BPF=y CONFIG_CGROUP_DEBUG=y CONFIG_NAMESPACES=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y +CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig index 4367e9b..af0680d 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig @@ -13,6 +13,7 @@ CONFIG_CGROUPS=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_BPF=y CONFIG_CGROUP_DEBUG=y CONFIG_NAMESPACES=y CONFIG_RELAY=y @@ -21,6 +22,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set CONFIG_KALLSYMS_ALL=y +CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig index e8d5b28..46ff17e 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig @@ -13,6 +13,7 @@ CONFIG_CGROUPS=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_BPF=y CONFIG_CGROUP_DEBUG=y CONFIG_NAMESPACES=y CONFIG_RELAY=y @@ -21,6 +22,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set CONFIG_KALLSYMS_ALL=y +CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx8/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx8/defconfig index 423f482..457685c 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx8/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx8/defconfig @@ -485,7 +485,7 @@ CONFIG_VIDEO_MX8_CAPTURE=y CONFIG_GMSL_MAX9286=y CONFIG_VIDEO_MXC_CSI_CAMERA=y CONFIG_MXC_MIPI_CSI=y -CONFIG_MXC_CAMERA_OV5640_MIPI_NV=y +CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m -- cgit v1.2.3