diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-17 17:25:10 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-17 17:25:10 +0400 |
| commit | c541f3f2ac299132ed05f75a84cc6a78d01530a9 (patch) | |
| tree | 9fbec9a6124b537c68f65a6e42991eb00b12a1d3 | |
| parent | 94ebec9e494e416e31e48e391533894a178bf322 (diff) | |
| parent | e8adb22b381dcfffe564dc77a6a85318a037a81d (diff) | |
Merge remote-tracking branch 'configs/config-boards-tracking' into ll-v3.7-misc-fixestracking-ll-v3.7-misc-fixes-ll-20121218.0tracking-ll-v3.7-misc-fixes-ll-20121217.0
| -rw-r--r-- | linaro/configs/u8500.conf | 2 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/linaro/configs/u8500.conf b/linaro/configs/u8500.conf index 75b9decc6591..61c1f232de80 100644 --- a/linaro/configs/u8500.conf +++ b/linaro/configs/u8500.conf @@ -7,7 +7,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_U8500=y CONFIG_MACH_HREFV60=y @@ -99,6 +98,7 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index a94b27fa1e33..0d144d45fff0 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -41,7 +41,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y -CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV is not set CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -52,19 +52,24 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set +CONFIG_FB=y +CONFIG_FB_ARMCLCD=y # CONFIG_VGA_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y -CONFIG_EXT4_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set CONFIG_FUSE_FS=y @@ -84,7 +89,3 @@ CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_ATOMIC64_SELFTEST=y CONFIG_DEBUG_ERRORS=y -CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y -CONFIG_VIRTIO_MMIO=y |