meta-digi-arm: Synchronize defconfigs with kernel's.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
This commit is contained in:
Alex Gonzalez 2013-02-14 16:55:58 +01:00
parent e18cb7e7de
commit b3435cd892
3 changed files with 16 additions and 24 deletions

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.14 # Linux kernel version: 2.6.35.14
# Wed Dec 19 11:53:52 2012 # Wed May 30 12:30:31 2012
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -278,16 +278,6 @@ CONFIG_CCARDIMX28_ENET1=y
# CONFIG_CCARDIMX28_SPI_SSP1_ENABLE is not set # CONFIG_CCARDIMX28_SPI_SSP1_ENABLE is not set
CONFIG_CCARDIMX28_SPI_SSP3_ENABLE=y CONFIG_CCARDIMX28_SPI_SSP3_ENABLE=y
#
# Video Options
#
# CONFIG_CCARDIMX28_16_BITSPERPIXEL is not set
# CONFIG_CCARDIMX28_24_BITSPERPIXEL is not set
CONFIG_CCARDIMX28_32_BITSPERPIXEL=y
CONFIG_CCARDIMX28_DEFAULT_VIDEO_BPP=32
CONFIG_CCARDIMX28_DISP_RGB666=y
# CONFIG_CCARDIMX28_DISP_RGB888 is not set
CONFIG_CCARDIMX28_DISP_DATABUS_WIDTH=18
CONFIG_DMA_ZONE=y CONFIG_DMA_ZONE=y
CONFIG_MXS_CONSISTENT_DMA_SIZE=32 CONFIG_MXS_CONSISTENT_DMA_SIZE=32
CONFIG_MXS_ICOLL=y CONFIG_MXS_ICOLL=y
@ -1078,7 +1068,7 @@ CONFIG_W1_MASTER_DS2482=y
# #
# CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_THERM is not set
# CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_SMEM is not set
# CONFIG_W1_SLAVE_DS2431 is not set CONFIG_W1_SLAVE_DS2431=y
# CONFIG_W1_SLAVE_DS2751 is not set # CONFIG_W1_SLAVE_DS2751 is not set
# CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2433 is not set
# CONFIG_W1_SLAVE_DS2438 is not set # CONFIG_W1_SLAVE_DS2438 is not set
@ -1687,7 +1677,6 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_PCOMP=y
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MANAGER_TESTS=y
# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_NULL is not set
CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_WORKQUEUE=y

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.14 # Linux kernel version: 2.6.35.14
# Tue Jan 29 12:30:04 2013 # Wed May 30 12:33:57 2012
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -275,7 +275,6 @@ CONFIG_JSCCIMX51_V2=y
CONFIG_MXC_NAND_SWAP_BI=y CONFIG_MXC_NAND_SWAP_BI=y
CONFIG_ARCH_MXC_HAS_NFC_V3=y CONFIG_ARCH_MXC_HAS_NFC_V3=y
CONFIG_ARCH_MXC_HAS_NFC_V3_2=y CONFIG_ARCH_MXC_HAS_NFC_V3_2=y
# CONFIG_MXC_BLUETOOTH_RFKILL is not set
# CONFIG_MXC_ENABLE_WARM_RESET is not set # CONFIG_MXC_ENABLE_WARM_RESET is not set
CONFIG_CCIMX5X_PM_POWER_BUTTON=y CONFIG_CCIMX5X_PM_POWER_BUTTON=y
@ -323,6 +322,8 @@ CONFIG_SPI_MXC_SELECT1_SS1=y
# #
# I2C Interface options # I2C Interface options
# #
# CONFIG_CONFIG_MXC_I2C1_STANDARD is not set
CONFIG_CONFIG_MXC_I2C1_FAST=y
CONFIG_I2C_MX_SELECT2=y CONFIG_I2C_MX_SELECT2=y
# CONFIG_CONFIG_MXC_I2C2_STANDARD is not set # CONFIG_CONFIG_MXC_I2C2_STANDARD is not set
CONFIG_CONFIG_MXC_I2C2_FAST=y CONFIG_CONFIG_MXC_I2C2_FAST=y
@ -353,8 +354,9 @@ CONFIG_CCIMX5X_DISP0_RGB666=y
# #
# and set 18bit color mode for the Display 1 # and set 18bit color mode for the Display 1
# #
# CONFIG_CCWMX5X_SECOND_TOUCH is not set # CONFIG_CCIMX5X_SECOND_TOUCH is not set
# CONFIG_CCWMX5X_FUSION_MULTITOUCH is not set # CONFIG_CCIMX5X_FUSION_4_MULTITOUCH is not set
# CONFIG_CCIMX5X_FUSION_7_10_MULTITOUCH is not set
CONFIG_IRAM_ALLOC=y CONFIG_IRAM_ALLOC=y
CONFIG_DMA_ZONE_SIZE=112 CONFIG_DMA_ZONE_SIZE=112
CONFIG_ISP1504_MXC=y CONFIG_ISP1504_MXC=y
@ -914,7 +916,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
# CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_EGALAX is not set
# CONFIG_TOUCHSCREEN_FUSION is not set # CONFIG_TOUCHSCREEN_FUSION_4 is not set
# CONFIG_TOUCHSCREEN_FUSION_7_10 is not set
# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set
# CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_GUNZE is not set
# CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_ELO is not set
@ -1372,6 +1375,7 @@ CONFIG_SND_SOC_IMX_CCIMX51_WM8753=y
# CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set # CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH is not set
# CONFIG_SND_SOC_IMX_3STACK_CS42888 is not set # CONFIG_SND_SOC_IMX_3STACK_CS42888 is not set
# CONFIG_SND_SOC_IMX_SPDIF is not set # CONFIG_SND_SOC_IMX_SPDIF is not set
# CONFIG_MXC_SSI_DUAL_FIFO is not set
CONFIG_SND_SOC_I2C_AND_SPI=y CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM8753=y CONFIG_SND_SOC_WM8753=y
@ -2012,7 +2016,6 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_PCOMP=y
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MANAGER_TESTS=y
# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_NULL is not set
CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_WORKQUEUE=y

View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.14 # Linux kernel version: 2.6.35.14
# Tue Jan 29 12:23:43 2013 # Wed May 30 12:34:30 2012
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -275,7 +275,6 @@ CONFIG_JSCCIMX53_V2=y
CONFIG_MXC_NAND_SWAP_BI=y CONFIG_MXC_NAND_SWAP_BI=y
CONFIG_ARCH_MXC_HAS_NFC_V3=y CONFIG_ARCH_MXC_HAS_NFC_V3=y
CONFIG_ARCH_MXC_HAS_NFC_V3_2=y CONFIG_ARCH_MXC_HAS_NFC_V3_2=y
# CONFIG_MXC_BLUETOOTH_RFKILL is not set
# CONFIG_MXC_ENABLE_WARM_RESET is not set # CONFIG_MXC_ENABLE_WARM_RESET is not set
CONFIG_CCIMX5X_PM_POWER_BUTTON=y CONFIG_CCIMX5X_PM_POWER_BUTTON=y
@ -371,7 +370,8 @@ CONFIG_CCIMX5X_DISP1=y
CONFIG_CCIMX5X_DISP1_RGB888=y CONFIG_CCIMX5X_DISP1_RGB888=y
# CONFIG_CCIMX5X_DISP1_RGB666 is not set # CONFIG_CCIMX5X_DISP1_RGB666 is not set
# CONFIG_CCIMX5X_SECOND_TOUCH is not set # CONFIG_CCIMX5X_SECOND_TOUCH is not set
# CONFIG_CCIMX5X_FUSION_MULTITOUCH is not set # CONFIG_CCIMX5X_FUSION_4_MULTITOUCH is not set
# CONFIG_CCIMX5X_FUSION_7_10_MULTITOUCH is not set
CONFIG_IRAM_ALLOC=y CONFIG_IRAM_ALLOC=y
CONFIG_DMA_ZONE_SIZE=184 CONFIG_DMA_ZONE_SIZE=184
CONFIG_ISP1504_MXC=y CONFIG_ISP1504_MXC=y
@ -935,7 +935,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
# CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_EGALAX is not set
# CONFIG_TOUCHSCREEN_FUSION is not set # CONFIG_TOUCHSCREEN_FUSION_4 is not set
# CONFIG_TOUCHSCREEN_FUSION_7_10 is not set
# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set
# CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_GUNZE is not set
# CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_ELO is not set
@ -2148,7 +2149,6 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_PCOMP=y
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MANAGER_TESTS=y
# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_NULL is not set
CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_WORKQUEUE=y