From: Linus Torvalds Date: Sat, 5 Apr 2014 21:44:13 +0000 (-0700) Subject: Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: v3.15-rc1~78 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=930b440cd8256f3861bdb0a59d26efaadac7941a;p=~emulex%2Finfiniband.git Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC board changes from Arnd Bergmann: "As we continue to replace board files with device tree descriptions, this part of the ARM support is getting smaller. We have basically just defconfig changes here this time, and a significant number of Renesas shmobile changes, as Renesas is still in the process of deprecating board file support" * tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits) ARM: enable fhandle in multi_v7_defconfig ARM: tegra: enable fhandle in tegra_defconfig ARM: update multi_v7_defconfig for Tegra ARM: add Marvell Dove and some drivers to multi_v7 defconfig ARM: fix duplicate symbols in multi_v5_defconfig ARM: pxa: add gpio keys information ARM: tegra: defconfig updates ARM: config: keystone: enable AEMIF/NAND support ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig ARM: config: Add mvebu_v5_defconfig ARM: config: Add a multi_v5_defconfig ARM: shmobile: r7s72100: update defconfig for I2C usage ARM: shmobile: Remove Lager DT reference legacy clock bits ARM: shmobile: Remove Koelsch DT reference legacy clock bits ARM: shmobile: Remove KZM9D board code ARM: mvebu: update defconfigs for Armada 375 and 38x ARM: dove: Enable watchdog support in the defconfig ARM: mvebu: Enable watchdog support in defconfig ARM: config: keystone: enable led support ... --- 930b440cd8256f3861bdb0a59d26efaadac7941a diff --cc arch/arm/configs/multi_v7_defconfig index 4863cdc3fb9,28b572a3e6c..d4e8a47a2f7 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -9,9 -10,11 +10,12 @@@ CONFIG_MODULE_UNLOAD= CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y + CONFIG_MACH_ARMADA_375=y + CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y + CONFIG_MACH_DOVE=y CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y CONFIG_ARCH_BCM_MOBILE=y CONFIG_ARCH_BERLIN=y CONFIG_MACH_BERLIN_BG2=y diff --cc arch/arm/configs/mvebu_v7_defconfig index 00000000000,62b6a37626c..a34713d8db9 mode 000000,100644..100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@@ -1,0 -1,116 +1,117 @@@ + CONFIG_EXPERIMENTAL=y + CONFIG_SYSVIPC=y + CONFIG_IRQ_DOMAIN_DEBUG=y + CONFIG_HIGH_RES_TIMERS=y + CONFIG_LOG_BUF_SHIFT=14 + CONFIG_BLK_DEV_INITRD=y + CONFIG_EXPERT=y + CONFIG_SLAB=y + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y + CONFIG_ARCH_MVEBU=y + CONFIG_MACH_ARMADA_370=y + CONFIG_MACH_ARMADA_375=y + CONFIG_MACH_ARMADA_38X=y + CONFIG_MACH_ARMADA_XP=y ++CONFIG_NEON=y + # CONFIG_CACHE_L2X0 is not set + # CONFIG_SWP_EMULATE is not set + CONFIG_PCI=y + CONFIG_PCI_MVEBU=y + CONFIG_SMP=y + CONFIG_AEABI=y + CONFIG_HIGHMEM=y + # CONFIG_COMPACTION is not set + CONFIG_ZBOOT_ROM_TEXT=0x0 + CONFIG_ZBOOT_ROM_BSS=0x0 + CONFIG_ARM_APPENDED_DTB=y + CONFIG_ARM_ATAG_DTB_COMPAT=y + CONFIG_VFP=y + CONFIG_NET=y + CONFIG_INET=y + CONFIG_BT=y + CONFIG_BT_MRVL=y + CONFIG_BT_MRVL_SDIO=y + CONFIG_CFG80211=y + CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + CONFIG_BLK_DEV_SD=y + CONFIG_ATA=y + CONFIG_SATA_MV=y + CONFIG_NETDEVICES=y + CONFIG_MVNETA=y + CONFIG_MARVELL_PHY=y + CONFIG_MWIFIEX=y + CONFIG_MWIFIEX_SDIO=y + CONFIG_INPUT_EVDEV=y + CONFIG_KEYBOARD_GPIO=y + CONFIG_SERIAL_8250=y + CONFIG_SERIAL_8250_CONSOLE=y + CONFIG_I2C=y + CONFIG_SPI=y + CONFIG_SPI_ORION=y + CONFIG_I2C_MV64XXX=y + CONFIG_MTD=y + CONFIG_MTD_CHAR=y + CONFIG_MTD_M25P80=y + CONFIG_MTD_CFI=y + CONFIG_MTD_CFI_INTELEXT=y + CONFIG_MTD_CFI_AMDSTD=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP_OF=y + CONFIG_MTD_NAND=y + CONFIG_MTD_NAND_PXA3xx=y + CONFIG_SERIAL_8250_DW=y + CONFIG_GPIOLIB=y + CONFIG_GPIO_SYSFS=y + CONFIG_THERMAL=y + CONFIG_ARMADA_THERMAL=y + CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_SOC=y + CONFIG_SND_KIRKWOOD_SOC=y + CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y + CONFIG_WATCHDOG=y + CONFIG_ORION_WATCHDOG=y + CONFIG_USB_SUPPORT=y + CONFIG_USB=y + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_ROOT_HUB_TT=y + CONFIG_USB_STORAGE=y + CONFIG_USB_XHCI_HCD=y + CONFIG_MMC=y + CONFIG_MMC_MVSDIO=y + CONFIG_NEW_LEDS=y + CONFIG_LEDS_GPIO=y + CONFIG_LEDS_CLASS=m + CONFIG_LEDS_TRIGGERS=y + CONFIG_LEDS_TRIGGER_TIMER=y + CONFIG_LEDS_TRIGGER_HEARTBEAT=y + CONFIG_RTC_CLASS=y + CONFIG_RTC_DRV_S35390A=y + CONFIG_RTC_DRV_MV=y + CONFIG_DMADEVICES=y + CONFIG_MV_XOR=y + CONFIG_MEMORY=y + CONFIG_MVEBU_DEVBUS=y + # CONFIG_IOMMU_SUPPORT is not set + CONFIG_EXT2_FS=y + CONFIG_EXT3_FS=y + # CONFIG_EXT3_FS_XATTR is not set + CONFIG_ISO9660_FS=y + CONFIG_JOLIET=y + CONFIG_UDF_FS=m + CONFIG_MSDOS_FS=y + CONFIG_VFAT_FS=y + CONFIG_TMPFS=y + CONFIG_NLS_CODEPAGE_437=y + CONFIG_NLS_CODEPAGE_850=y + CONFIG_NLS_ISO8859_1=y + CONFIG_NLS_ISO8859_2=y + CONFIG_NLS_UTF8=y + CONFIG_MAGIC_SYSRQ=y + CONFIG_DEBUG_FS=y + # CONFIG_SCHED_DEBUG is not set + CONFIG_TIMER_STATS=y + # CONFIG_DEBUG_BUGVERBOSE is not set + CONFIG_DEBUG_INFO=y + CONFIG_DEBUG_USER=y