From 7c8be11785d59a6f83f4d241334425d0726f9ab9 Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Wed, 21 Sep 2011 15:21:28 -0700 Subject: ARM: config: tegra: Cleaned up. Removed options selected by default and fixed option ordering to match savedefconfig. BUG none TEST=flashed and boot ubuntu desktop for Harmony and Ventana. Change-Id: Ida651aa7743209bde266063709d3f7732587c109 Signed-off-by: Jong Kim Reviewed-on: http://git-master/r/53871 Reviewed-by: Allen Martin --- arch/arm/configs/tegra_defconfig | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index e599afa339cf..cc895529ee65 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -166,22 +166,12 @@ CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y +CONFIG_MTD_NAND_TEGRA=y +CONFIG_MTD_NAND=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_XIP=y -# NAND BOOTING SUPPORT -CONFIG_MTD_NAND_TEGRA=y -CONFIG_MTD_NAND_IDS=y -CONFIG_MTD_NAND_ECC=y -CONFIG_MTD_NAND=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_YAFFS1=y -CONFIG_YAFFS_YAFFS2=y -CONFIG_YAFFS_AUTO_YAFFS2=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y -CONFIG_YAFFS_XATTR=y # CONFIG_ANDROID_PMEM is not set CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -194,13 +184,13 @@ CONFIG_NETDEVICES=y CONFIG_PHYLIB=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=y +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_MAC80211_HWSIM=m +CONFIG_ATH_COMMON=m CONFIG_BCM4329=m CONFIG_BCM4329_FW_PATH="/lib/firmware/bcm4329/fw_bcm4329.bin" CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/bcm4329/nvram.txt" CONFIG_BCM4329_WIFI_CONTROL_FUNC=y -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_MAC80211_HWSIM=m -CONFIG_ATH_COMMON=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -263,8 +253,8 @@ CONFIG_BATTERY_BQ20Z75=y CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_MFD_TPS6586X=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_TPS6586X=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m @@ -294,7 +284,6 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FB_TILEBLITTING=y -CONFIG_TEGRA_GRHOST=y CONFIG_TEGRA_DC=y CONFIG_TEGRA_DC_EXTENSIONS=y CONFIG_NVMAP_SEARCH_GLOBAL_HANDLES=y @@ -374,6 +363,8 @@ CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_ECRYPT_FS=y +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_DISABLE_TAGS_ECC=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y -- cgit v1.2.3