mvebu defconfig for 4.5 (part 2)
- Reenable DSA in mvebu_v5_defconfig - Update multi_v5_defconfig after adding Orion5x to multiarch -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlZq2NAACgkQCwYYjhRyO9Xu3gCeMhnGk15fEWF8WNkCpxPLJgxy gwcAoILSSQ2ByCvbL8h0DMwdOE16B2r/ =/oQV -----END PGP SIGNATURE----- Merge tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu into next/defconfig Merge "mvebu defconfig for 4.5 (part 2)" from Gregory CLEMENT: - Reenable DSA in mvebu_v5_defconfig - Update multi_v5_defconfig after adding Orion5x to multiarch * tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: update v5 defconfig for Orion5x machines ARM: mvebu: Reenable DSA in mvebu_v5_defconfig ARM: config: Add orion5x to multi_v5_defconfig ARM: config: Reenable DSA in multi_v5_defconfig ARM: config: Regenerate multi_v5_defconfig
This commit is contained in:
Arnd Bergmann
commit
e9293d92be
|
|
@ -11,10 +11,32 @@ CONFIG_MODULE_UNLOAD=y
|
|||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_MVEBU=y
|
||||
CONFIG_MACH_KIRKWOOD=y
|
||||
CONFIG_MACH_NETXBIG=y
|
||||
CONFIG_ARCH_MXC=y
|
||||
CONFIG_SOC_IMX25=y
|
||||
CONFIG_MACH_IMX27_DT=y
|
||||
CONFIG_SOC_IMX25=y
|
||||
CONFIG_ARCH_ORION5X=y
|
||||
CONFIG_MACH_DB88F5281=y
|
||||
CONFIG_MACH_RD88F5182=y
|
||||
CONFIG_MACH_RD88F5182_DT=y
|
||||
CONFIG_MACH_KUROBOX_PRO=y
|
||||
CONFIG_MACH_DNS323=y
|
||||
CONFIG_MACH_TS209=y
|
||||
CONFIG_MACH_TERASTATION_PRO2=y
|
||||
CONFIG_MACH_LINKSTATION_PRO=y
|
||||
CONFIG_MACH_LINKSTATION_LSCHL=y
|
||||
CONFIG_MACH_LINKSTATION_MINI=y
|
||||
CONFIG_MACH_LINKSTATION_LS_HGL=y
|
||||
CONFIG_MACH_TS409=y
|
||||
CONFIG_MACH_WRT350N_V2=y
|
||||
CONFIG_MACH_TS78XX=y
|
||||
CONFIG_MACH_MV2120=y
|
||||
CONFIG_MACH_D2NET_DT=y
|
||||
CONFIG_MACH_NET2BIG=y
|
||||
CONFIG_MACH_MSS2_DT=y
|
||||
CONFIG_MACH_WNR854T=y
|
||||
CONFIG_MACH_RD88F5181L_GE=y
|
||||
CONFIG_MACH_RD88F5181L_FXO=y
|
||||
CONFIG_MACH_RD88F6183AP_GE=y
|
||||
CONFIG_ARCH_U300=y
|
||||
CONFIG_PCI_MVEBU=y
|
||||
CONFIG_PREEMPT=y
|
||||
|
|
@ -38,6 +60,8 @@ CONFIG_IP_PNP=y
|
|||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_IP_PNP_BOOTP=y
|
||||
# CONFIG_IPV6 is not set
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NET_PKTGEN=m
|
||||
CONFIG_CFG80211=y
|
||||
CONFIG_MAC80211=y
|
||||
|
|
@ -53,7 +77,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
|
|||
CONFIG_MTD_CFI_INTELEXT=y
|
||||
CONFIG_MTD_CFI_STAA=y
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_M25P80=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_ORION=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
|
|
@ -66,8 +89,11 @@ CONFIG_ATA=y
|
|||
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_61_65=y
|
||||
CONFIG_NET_DSA_MV88E6171=y
|
||||
CONFIG_NET_DSA_MV88E6352=y
|
||||
CONFIG_MV643XX_ETH=y
|
||||
CONFIG_R8169=y
|
||||
CONFIG_MARVELL_PHY=y
|
||||
|
|
@ -92,7 +118,6 @@ CONFIG_I2C_NOMADIK=y
|
|||
CONFIG_SPI=y
|
||||
CONFIG_SPI_ORION=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_POWER_SUPPLY=y
|
||||
CONFIG_POWER_RESET=y
|
||||
CONFIG_POWER_RESET_GPIO=y
|
||||
CONFIG_POWER_RESET_QNAP=y
|
||||
|
|
@ -105,17 +130,16 @@ CONFIG_THERMAL=y
|
|||
CONFIG_KIRKWOOD_THERMAL=y
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_ORION_WATCHDOG=y
|
||||
# CONFIG_ABX500_CORE is not set
|
||||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SND=y
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_KIRKWOOD_SOC=y
|
||||
CONFIG_SND_KIRKWOOD_SOC_T5325=y
|
||||
CONFIG_SND_SOC_ALC5623=y
|
||||
CONFIG_SND_SIMPLE_CARD=y
|
||||
# CONFIG_ABX500_CORE is not set
|
||||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_HID_DRAGONRISE=y
|
||||
CONFIG_HID_GYRATION=y
|
||||
CONFIG_HID_TWINHAN=y
|
||||
|
|
@ -162,8 +186,6 @@ CONFIG_STAGING=y
|
|||
CONFIG_FB_XGI=y
|
||||
CONFIG_EXT2_FS=y
|
||||
CONFIG_EXT3_FS=y
|
||||
# CONFIG_EXT3_FS_XATTR is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_ISO9660_FS=m
|
||||
CONFIG_JOLIET=y
|
||||
CONFIG_UDF_FS=m
|
||||
|
|
@ -189,7 +211,6 @@ CONFIG_DEBUG_KERNEL=y
|
|||
CONFIG_DEBUG_USER=y
|
||||
CONFIG_CRYPTO_CBC=m
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
CONFIG_CRYPTO_DEV_MV_CESA=y
|
||||
CONFIG_CRC_CCITT=y
|
||||
CONFIG_LIBCRC32C=y
|
||||
|
|
|
|||
|
|
@ -12,7 +12,29 @@ CONFIG_MODULE_UNLOAD=y
|
|||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_MVEBU=y
|
||||
CONFIG_MACH_KIRKWOOD=y
|
||||
# CONFIG_CPU_FEROCEON_OLD_ID is not set
|
||||
CONFIG_ARCH_ORION5X=y
|
||||
CONFIG_MACH_DB88F5281=y
|
||||
CONFIG_MACH_RD88F5182=y
|
||||
CONFIG_MACH_RD88F5182_DT=y
|
||||
CONFIG_MACH_KUROBOX_PRO=y
|
||||
CONFIG_MACH_DNS323=y
|
||||
CONFIG_MACH_TS209=y
|
||||
CONFIG_MACH_TERASTATION_PRO2=y
|
||||
CONFIG_MACH_LINKSTATION_PRO=y
|
||||
CONFIG_MACH_LINKSTATION_LSCHL=y
|
||||
CONFIG_MACH_LINKSTATION_MINI=y
|
||||
CONFIG_MACH_LINKSTATION_LS_HGL=y
|
||||
CONFIG_MACH_TS409=y
|
||||
CONFIG_MACH_WRT350N_V2=y
|
||||
CONFIG_MACH_TS78XX=y
|
||||
CONFIG_MACH_MV2120=y
|
||||
CONFIG_MACH_D2NET_DT=y
|
||||
CONFIG_MACH_NET2BIG=y
|
||||
CONFIG_MACH_MSS2_DT=y
|
||||
CONFIG_MACH_WNR854T=y
|
||||
CONFIG_MACH_RD88F5181L_GE=y
|
||||
CONFIG_MACH_RD88F5181L_FXO=y
|
||||
CONFIG_MACH_RD88F6183AP_GE=y
|
||||
CONFIG_PCI_MVEBU=y
|
||||
CONFIG_PREEMPT=y
|
||||
CONFIG_AEABI=y
|
||||
|
|
@ -35,6 +57,8 @@ CONFIG_IP_PNP=y
|
|||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_IP_PNP_BOOTP=y
|
||||
# CONFIG_IPV6 is not set
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NET_PKTGEN=m
|
||||
CONFIG_CFG80211=y
|
||||
CONFIG_MAC80211=y
|
||||
|
|
@ -66,6 +90,11 @@ CONFIG_ATA=y
|
|||
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_61_65=y
|
||||
CONFIG_NET_DSA_MV88E6171=y
|
||||
CONFIG_NET_DSA_MV88E6352=y
|
||||
CONFIG_MV643XX_ETH=y
|
||||
CONFIG_R8169=y
|
||||
CONFIG_MARVELL_PHY=y
|
||||
|
|
|
|||
Loading…
Reference in a new issue