From f246859c1988a033efc351076a299eb80f558fc9 Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Tue, 4 Jun 2013 09:55:00 -0700 Subject: nitrogen6x_*defconfig: clean up unsupported drivers Signed-off-by: Eric Nelson --- arch/arm/configs/nitrogen6x_defconfig | 16 +--------------- arch/arm/configs/nitrogen6x_mipi_defconfig | 18 ++---------------- 2 files changed, 3 insertions(+), 31 deletions(-) (limited to 'arch') diff --git a/arch/arm/configs/nitrogen6x_defconfig b/arch/arm/configs/nitrogen6x_defconfig index 4969fb21bd05..0a9119fd7b7c 100644 --- a/arch/arm/configs/nitrogen6x_defconfig +++ b/arch/arm/configs/nitrogen6x_defconfig @@ -43,7 +43,7 @@ CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw rootfstype=jffs2 ip=off" +CONFIG_CMDLINE="noinitrd console=ttymxc1,115200 root=/dev/mmcblk0p1" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -99,8 +99,6 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_MXS_PERFMON=m @@ -133,7 +131,6 @@ CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=y CONFIG_TOUCHSCREEN_TSC2004=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_ISL29023=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -145,19 +142,11 @@ CONFIG_I2C_IMX=y CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y -CONFIG_SENSORS_MAX17135=y -CONFIG_SENSORS_MAG3110=y -# CONFIG_MXC_MMA8450 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_IMX2_WDT=y -CONFIG_MFD_WM8994=y -CONFIG_MFD_PFUZE=y -CONFIG_MFD_MAX17135=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_PFUZE100=y -CONFIG_REGULATOR_MAX17135=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y # CONFIG_RC_CORE is not set @@ -194,9 +183,6 @@ CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_HIDRAW=y CONFIG_HID_QUANTA=y -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m CONFIG_USB=y CONFIG_USB_DEVICEFS=y # CONFIG_USB_DEVICE_CLASS is not set diff --git a/arch/arm/configs/nitrogen6x_mipi_defconfig b/arch/arm/configs/nitrogen6x_mipi_defconfig index 1e47340eb2ad..8cafdbbfd411 100644 --- a/arch/arm/configs/nitrogen6x_mipi_defconfig +++ b/arch/arm/configs/nitrogen6x_mipi_defconfig @@ -43,7 +43,7 @@ CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw rootfstype=jffs2 ip=off" +CONFIG_CMDLINE="noinitrd console=ttymxc1,115200 root=/dev/mmcblk0p1" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -99,8 +99,6 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_MXS_PERFMON=m @@ -133,7 +131,6 @@ CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=y CONFIG_TOUCHSCREEN_TSC2004=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_ISL29023=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -145,19 +142,11 @@ CONFIG_I2C_IMX=y CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y -CONFIG_SENSORS_MAX17135=y -CONFIG_SENSORS_MAG3110=y -# CONFIG_MXC_MMA8450 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_IMX2_WDT=y -CONFIG_MFD_WM8994=y -CONFIG_MFD_PFUZE=y -CONFIG_MFD_MAX17135=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_PFUZE100=y -CONFIG_REGULATOR_MAX17135=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y # CONFIG_RC_CORE is not set @@ -165,7 +154,7 @@ CONFIG_VIDEO_DEV=y CONFIG_VIDEO_MXC_CAMERA=m CONFIG_MXC_CAMERA_OV5640_MIPI=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m -# CONFIG_V4L_USB_DRIVERS is not set +CONFIG_USB_VIDEO_CLASS=m # CONFIG_RADIO_ADAPTERS is not set CONFIG_DRM=m CONFIG_DRM_VIVANTE=m @@ -194,9 +183,6 @@ CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_HIDRAW=y CONFIG_HID_QUANTA=y -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m CONFIG_USB=y CONFIG_USB_DEVICEFS=y # CONFIG_USB_DEVICE_CLASS is not set -- cgit v1.2.3