Commit 46dd1230 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge "ARM: mvebu: defconfig changes for v3.17 (round 2)" from Jason Cooper:

"Here's all the defconfig changes we have for mvebu this time around. The
big one is the removal of kirkwood_defconfig, corresponding to the
mach-kirkwood/ removal in mvebu/soc."

 - mvebu
   * Add appended_dtb support
   * Add devtmpfs support
   * Add 375 network driver
   * Add cpuidle support
   * Add cpufreq support

 - kirkwood
   * Remove kirkwood_defconfig

* tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
  ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
  ARM: Kirkwood: Remove kirkwood_defconfig
  ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
  ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
  ARM: mvebu: add appended DTB support in mvebu_v5_defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a67f02c9 c1eed8d2

arch/arm/configs/kirkwood_defconfig

deleted100644 → 0
+0 −181
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=19

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_KIRKWOOD=y

CONFIG_MACH_D2NET_V2=y

CONFIG_MACH_NET2BIG_V2=y

CONFIG_MACH_NET5BIG_V2=y

CONFIG_MACH_OPENRD_BASE=y

CONFIG_MACH_OPENRD_CLIENT=y

CONFIG_MACH_OPENRD_ULTIMATE=y

CONFIG_MACH_RD88F6192_NAS=y

CONFIG_MACH_RD88F6281=y

CONFIG_MACH_T5325=y

CONFIG_MACH_TS219=y

CONFIG_MACH_TS41X=y

CONFIG_ARCH_KIRKWOOD_DT=y

CONFIG_MACH_MV88F6281GTW_GE_DT=y

# CONFIG_CPU_FEROCEON_OLD_ID is not set

CONFIG_PCI_MVEBU=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_IDLE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_NET_PKTGEN=m

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set

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_MTD_SPI_NOR=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_EEPROM_AT24=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=m

CONFIG_CHR_DEV_SG=m

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_MV643XX_ETH=y

CONFIG_R8169=y

CONFIG_MARVELL_PHY=y

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_LEGACY_PTY_COUNT=16

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MV64XXX=y

CONFIG_SPI=y

CONFIG_SPI_ORION=y

CONFIG_GPIO_SYSFS=y

CONFIG_SENSORS_ADT7475=y

CONFIG_SENSORS_LM63=y

CONFIG_SENSORS_LM75=y

CONFIG_SENSORS_LM85=y

CONFIG_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_HID_DRAGONRISE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_NTRIG=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_HID_SMARTJOYPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

CONFIG_HID_ZEROPLUS=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_PRINTER=m

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

CONFIG_MMC=y

CONFIG_SDIO_UART=y

CONFIG_MMC_MVSDIO=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_RTC_DRV_MV=y

CONFIG_DMADEVICES=y

CONFIG_MV_XOR=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

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=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_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=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_CRC16=y

CONFIG_LIBCRC32C=y

arch/arm/configs/mvebu_v5_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ CONFIG_AEABI=y 
CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -37,6 +39,8 @@ CONFIG_NET_PKTGEN=m 
CONFIG_CFG80211=y

CONFIG_MAC80211=y

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

arch/arm/configs/mvebu_v7_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 
CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_MVEBU_V7_CPUIDLE=y

CONFIG_CPU_FREQ=y

CONFIG_CPUFREQ_GENERIC=y

CONFIG_VFP=y

CONFIG_NET=y

CONFIG_INET=y
@@ -46,6 +50,7 @@ CONFIG_AHCI_MVEBU=y 
CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_MVNETA=y

CONFIG_MVPP2=y

CONFIG_MARVELL_PHY=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE