summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Guoyin <guoyin.chen@nxp.com>2017-05-13 16:16:29 +0800
committerAmit Uttamchandani <amituttam@google.com>2017-05-25 15:36:25 -0700
commit5fcdc1bd53cd86cbcea42b2a080f95d8f29164b2 (patch)
tree030cbe199d1e29a416cc2c4e2cf61a44d606a225
parent9f04b7d0c59c7ec647a8fc66de6fb54761f0eb2f (diff)
downloadimx-v4.1-5fcdc1bd53cd86cbcea42b2a080f95d8f29164b2.tar.gz
ARM: defconfig: Support fuse program in mfgtool's zImage
Add CONFIG_FSL_OTP into mfgtool kernel config imx_v7_mfg_defconfig is updated through "make savedefconfig" Change-Id: I46c5e1a7adc744c1b481c814e37f9e8d8d20e42d Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
-rw-r--r--arch/arm/configs/imx_v7_mfg_defconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v7_mfg_defconfig b/arch/arm/configs/imx_v7_mfg_defconfig
index d5d19f45087d..fe3d0f35127d 100644
--- a/arch/arm/configs/imx_v7_mfg_defconfig
+++ b/arch/arm/configs/imx_v7_mfg_defconfig
@@ -26,7 +26,6 @@ CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
-CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX6ULL=y
CONFIG_SOC_IMX7D=y
CONFIG_SOC_VF610=y
@@ -131,8 +130,8 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
CONFIG_TOUCHSCREEN_MC13783=y
CONFIG_TOUCHSCREEN_TSC2007=y
CONFIG_TOUCHSCREEN_STMPE=y
@@ -145,7 +144,7 @@ CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_IMX_SEMA4=y
+CONFIG_FSL_OTP=y
CONFIG_HW_RANDOM=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
@@ -182,9 +181,9 @@ CONFIG_RC_DEVICES=y
CONFIG_IR_GPIO_CIR=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_PXP_V4L2=y
CONFIG_SOC_CAMERA=y
CONFIG_VIDEO_MX3=y
-CONFIG_VIDEO_MXC_PXP_V4L2=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=y
CONFIG_SOC_CAMERA_OV2640=y