diff options
author | John Stultz <john.stultz@linaro.org> | 2012-03-29 10:34:13 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2012-04-11 19:21:21 -0700 |
commit | 65707a0991ddff1e499a90bd6fb33be5d49f236f (patch) | |
tree | 120deff70d4366a54ee2e60d2b8bbff3c755e710 /configs | |
parent | 9a55db44be288e5de2ad4539b8e04d10bf1d2b70 (diff) |
config: Fixups from Tixy and Tushar
Small fixes noted by Tixy and Tushar
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/imx5.conf | 6 | ||||
-rw-r--r-- | configs/origen.conf | 1 | ||||
-rw-r--r-- | configs/panda.conf | 1 | ||||
-rw-r--r-- | configs/ubuntu.conf | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/configs/imx5.conf b/configs/imx5.conf index 00f25de1ebcc..0196c572bb14 100644 --- a/configs/imx5.conf +++ b/configs/imx5.conf @@ -9,13 +9,10 @@ CONFIG_MAC80211=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_DEFAULT_PID=y CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y CONFIG_SMC91X=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y @@ -43,11 +40,9 @@ CONFIG_KEYBOARD_MPR121=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y CONFIG_SERIO_SERPORT=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_HW_RANDOM=y @@ -79,7 +74,6 @@ CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PWM=y -CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONTS=y CONFIG_FONT_8x16=y CONFIG_SOUND=y diff --git a/configs/origen.conf b/configs/origen.conf index 93ed9dbf7d76..9a589ac92a9c 100644 --- a/configs/origen.conf +++ b/configs/origen.conf @@ -95,3 +95,4 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_S3C=y CONFIG_DEBUG_LL=y CONFIG_DEBUG_S3C_UART2=y +CONFIG_EARLY_PRINTK=y diff --git a/configs/panda.conf b/configs/panda.conf index 59a13be444ec..a80ecaba2c5b 100644 --- a/configs/panda.conf +++ b/configs/panda.conf @@ -38,7 +38,6 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_TWL4030=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set diff --git a/configs/ubuntu.conf b/configs/ubuntu.conf index 3c3ab8d7b629..25bb2443f4b2 100644 --- a/configs/ubuntu.conf +++ b/configs/ubuntu.conf @@ -1,6 +1,7 @@ # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_COMPAT_BRK is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=0 +CONFIG_MODULES=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y CONFIG_SYN_COOKIES=y |