Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c58449 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable QPIC NAND driver and UBI/UBIFS configs"

parents d4ffe7b2 e1ad0387

arch/arm/configs/msm8909-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -216,7 +216,9 @@ CONFIG_MTD=y 
CONFIG_MTD_TESTS=m

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_MSM_QPIC_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_UBI=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -475,6 +477,8 @@ CONFIG_QUOTA=y 
CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

arch/arm/configs/msm8909_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -221,7 +221,9 @@ CONFIG_MTD=y 
CONFIG_MTD_TESTS=m

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_MSM_QPIC_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_UBI=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -490,6 +492,8 @@ CONFIG_QUOTA=y 
CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y