diff options
| author | Javier Viguera <javier.viguera@digi.com> | 2012-02-09 19:46:32 +0100 |
|---|---|---|
| committer | Javier Viguera <javier.viguera@digi.com> | 2012-02-09 19:46:32 +0100 |
| commit | 07f0cd3e083dd53f828b3705229cba9444833d14 (patch) | |
| tree | 3ba937c7458492bf146852c58f109650b0d56b37 | |
| parent | b601d63f95edc0e607482ccfc128b49f56232a33 (diff) | |
ccxmx5xjs: update defconfigs
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
| -rw-r--r-- | arch/arm/configs/imx5_ccwmx51js_defconfig | 10 | ||||
| -rw-r--r-- | arch/arm/configs/imx5_ccwmx53js_defconfig | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/configs/imx5_ccwmx51js_defconfig b/arch/arm/configs/imx5_ccwmx51js_defconfig index e38276b545ad..48cac2f6c5f6 100644 --- a/arch/arm/configs/imx5_ccwmx51js_defconfig +++ b/arch/arm/configs/imx5_ccwmx51js_defconfig @@ -285,6 +285,11 @@ CONFIG_CCXMX5X_PM_POWER_BUTTON=y # # Serial Port Options # +# CONFIG_CONSOLE_UART1 is not set +CONFIG_CONSOLE_UART2=y +# CONFIG_CONSOLE_UART3 is not set +# CONFIG_CONSOLE_UART4 is not set +# CONFIG_CONSOLE_UART5 is not set CONFIG_UART1_ENABLED=y CONFIG_UART1_MODE_STANDARD=y # CONFIG_UART1_MODE_IRDA is not set @@ -1315,9 +1320,11 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_LOGO=y +CONFIG_FB_LOGO_CENTERED=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_LOGO_CUSTOM_CLUT224=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y @@ -2000,6 +2007,7 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set CONFIG_CRYPTO_WORKQUEUE=y diff --git a/arch/arm/configs/imx5_ccwmx53js_defconfig b/arch/arm/configs/imx5_ccwmx53js_defconfig index 0884828f0752..9aced203974e 100644 --- a/arch/arm/configs/imx5_ccwmx53js_defconfig +++ b/arch/arm/configs/imx5_ccwmx53js_defconfig @@ -1466,9 +1466,11 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_LOGO=y +CONFIG_FB_LOGO_CENTERED=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_LOGO_CUSTOM_CLUT224=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y |