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

Commit 3197f7dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-defconfig-4.9-1' of git://git.infradead.org/linux-mvebu into next/defconfig 

Pull "mvebu defconfig for 4.9 (part 1)" from Gregory CLEMENT:

- update dsa config with new symbol
- add flash related config for mvebu v7

* tag 'mvebu-defconfig-4.9-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu_v5_defconfig: use MV88E6XXX
  ARM: mvebu: enable UBI and UBIFS in mvebu_v7_defconfig
  ARM: mvebu: enable MTD command line partition table in mvebu_v7_defconfig
parents 35e53e33 1ab9a7da

arch/arm/configs/mvebu_v5_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -91,10 +91,7 @@ CONFIG_SATA_AHCI=y 
CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MV88E6060=y

CONFIG_NET_DSA_MV88E6131=y

CONFIG_NET_DSA_MV88E6123=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_NET_DSA_MV88E6352=y

CONFIG_NET_DSA_MV88E6XXX=y

CONFIG_MV643XX_ETH=y

CONFIG_R8169=y

CONFIG_MARVELL_PHY=y

arch/arm/configs/mvebu_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y
@@ -59,6 +60,7 @@ CONFIG_MTD_NAND=y 
CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_SPI_NOR=y

CONFIG_SRAM=y

CONFIG_MTD_UBI=y

CONFIG_EEPROM_AT24=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y
@@ -140,6 +142,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y