diff options
| author | Jason Liu <jason.hui.liu@nxp.com> | 2019-12-16 10:14:57 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-12-16 10:14:57 +0800 |
| commit | c84c7c3c3c82bc8db5e775113a3f2105751988f5 (patch) | |
| tree | bef5831c079ff21d26e2f3d16e561cb1610df94c /arch/arm/configs | |
| parent | dea2fede7e024ee7029b13e8d82a00ec14427777 (diff) | |
| parent | c85bf6f6903ad154848fee495b3b34c3cde86f6c (diff) | |
Merge remote-tracking branch 'linux-lts-nxp/lf-5.4.y' into imx_5.4.y
* linux-lts-nxp/lf-5.4.y: (13 commits)
LF-467: media: imx: isi: fix some typo issues
LF-462 ARM: dts: imx7d-12x12-lpddr3-val: correct the phy interface mode
arm64: config: enable usb network card R8152 AX88179 and AX8817X driver
...
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index f36f95713ae9..ee90e29fe2d3 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -10,6 +10,7 @@ CONFIG_CGROUPS=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y +CONFIG_KALLSYMS_ALL=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set @@ -313,6 +314,7 @@ CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y CONFIG_FB_MXS=y CONFIG_FB_MXC_SYNC_PANEL=y +CONFIG_FB_MXC_OVERLAY=y CONFIG_FB_MXC_MIPI_DSI_NORTHWEST=y CONFIG_FB_MXC_ADV7535=y CONFIG_FB_MXC_TRULY_PANEL_TFT3P5581E=y @@ -321,7 +323,6 @@ CONFIG_FB_MXC_RK_PANEL_RK055AHD042=y CONFIG_FB_MXC_RK_PANEL_RK055IQH042=y CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y CONFIG_FB_MXC_MIPI_DSI=y -CONFIG_FB_MXC_OVERLAY=y CONFIG_FB_MXC_LDB=y CONFIG_FB_MXC_EINK_PANEL=y CONFIG_FB_MXC_EINK_V2_PANEL=y @@ -541,8 +542,9 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set -CONFIG_PROVE_LOCKING=y +# CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set |