diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-12 08:12:30 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-12 08:12:30 +0200 |
| commit | f1209c0da26fc54d8c567a039d7765b6ad23bd5b (patch) | |
| tree | 2d80c67c8e2b22ce5ebee0f617c3c71b6763c8f2 /arch | |
| parent | ff73aabd871910b44bea051e41c5024584b1061b (diff) | |
| parent | 834b98d0367931d6bec5a48fe87fddd9b877f688 (diff) | |
Merge branch 'tegra-nand-next' into tegra-next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/colibri_t20_android_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_t20_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/sam9_l9260_defconfig | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/configs/colibri_t20_android_defconfig b/arch/arm/configs/colibri_t20_android_defconfig index eebe621e7f84..09780945a35a 100644 --- a/arch/arm/configs/colibri_t20_android_defconfig +++ b/arch/arm/configs/colibri_t20_android_defconfig @@ -186,6 +186,7 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_NAND_TEGRA=y CONFIG_MTD_NAND=y CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_FASTMAP=y CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_UID_STAT=y @@ -366,8 +367,6 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y diff --git a/arch/arm/configs/colibri_t20_defconfig b/arch/arm/configs/colibri_t20_defconfig index cb9e37e371c9..9ef27a6676f4 100644 --- a/arch/arm/configs/colibri_t20_defconfig +++ b/arch/arm/configs/colibri_t20_defconfig @@ -162,6 +162,7 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_NAND_TEGRA=y CONFIG_MTD_NAND=y CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_FASTMAP=y CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_UID_STAT=y @@ -323,8 +324,6 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=m CONFIG_NTFS_RW=y CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig index ecf2531523a1..b4384af1bea6 100644 --- a/arch/arm/configs/sam9_l9260_defconfig +++ b/arch/arm/configs/sam9_l9260_defconfig @@ -39,7 +39,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ATMEL=y CONFIG_MTD_NAND_PLATFORM=y CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_BEB_RESERVE=3 +CONFIG_MTD_UBI_BEB_LIMIT=25 CONFIG_MTD_UBI_GLUEBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y |