diff options
| author | Katherine Lu <katherine.lu@freescale.com> | 2009-08-07 10:03:36 +0800 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2009-08-07 09:47:45 -0500 |
| commit | fb7b8d7f783a4d78fdd75b42948abc4238669b71 (patch) | |
| tree | 495ade193f6a25ef4172173e1f657f6f87c7e109 | |
| parent | c03ece65f49b0d720e5cd13c7460503a32471bea (diff) | |
ENGR00114881 MX51: Disable SAHARA by default
Disable SAHARA by default.
Signed-off-by: Katherine Lu <katherine.lu@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx51_defconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/imx51_defconfig b/arch/arm/configs/imx51_defconfig index 69ccfa64082e..f8bd9e2bfb4d 100644 --- a/arch/arm/configs/imx51_defconfig +++ b/arch/arm/configs/imx51_defconfig @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28 +# Fri Aug 7 10:02:56 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -181,9 +182,9 @@ CONFIG_ARCH_MX51=y CONFIG_I2C_MXC_SELECT1=y CONFIG_I2C_MXC_SELECT2=y CONFIG_MXC_SDMA_API=y -# CONFIG_I2C_MXC_SELECT3 is not set CONFIG_SDMA_IRAM=y CONFIG_SDMA_IRAM_SIZE=0x1000 +# CONFIG_I2C_MXC_SELECT3 is not set CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_ARCH_MXC_HAS_NFC_V3=y @@ -206,6 +207,7 @@ CONFIG_MXC_TZIC=y CONFIG_DMA_ZONE_SIZE=64 CONFIG_UTMI_MXC=y CONFIG_UTMI_MXC_OTG=y +# CONFIG_MXC_PWM is not set # # Processor Type @@ -1116,7 +1118,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # @@ -1204,6 +1206,7 @@ CONFIG_SND_MXC_SOC_IRAM=y CONFIG_SND_SOC_IMX_3STACK_SGTL5000=y # CONFIG_SND_SOC_IMX_3STACK_AK4647 is not set # CONFIG_SND_SOC_IMX_3STACK_WM8580 is not set +# CONFIG_SND_SOC_IMX_3STACK_AK5702 is not set # CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_SGTL5000=y @@ -1561,9 +1564,7 @@ CONFIG_SCC_DEBUG=y # # SAHARA2 Security Hardware Support # -CONFIG_MXC_SAHARA=y -CONFIG_MXC_SAHARA_USER_MODE=y -# CONFIG_MXC_SAHARA_POLL_MODE is not set +# CONFIG_MXC_SAHARA is not set # # MXC MPEG4 Encoder Kernel module support |