From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 May 2016 12:25:54 +0000 (+0200)
Subject: Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next... 
X-Git-Tag: v4.7-rc1~134^2~2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=2cbb21d749efb9ca1eef04f04d189d4961b33b79;p=cascardo%2Flinux.git

Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next/defconfig

Merge "aspeed defconfig for 4.7" from Joel Stanley:

This adds configurations used for testing Aspeed BMC SoCs, as well as adding
the v5 part to the multi defconfig.

* tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux:
  arm/configs: Add Aspeed defconfig
  arm/configs/multi_v5: Add Aspeed ast2400
---

2cbb21d749efb9ca1eef04f04d189d4961b33b79
diff --cc arch/arm/configs/multi_v5_defconfig
index a822dd346fb2,f635f37174b2..ccafa84aedfe
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@@ -13,12 -11,10 +13,14 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_KIRKWOOD=y
+ CONFIG_ARCH_ASPEED=y
+ CONFIG_MACH_ASPEED_G4=y
  CONFIG_ARCH_MXC=y
 +CONFIG_MACH_MX21ADS=y
 +CONFIG_MACH_MX27ADS=y
 +CONFIG_MACH_MX27_3DS=y
 +CONFIG_MACH_IMX27_VISSTRIM_M10=y
 +CONFIG_MACH_PCA100=y
  CONFIG_MACH_IMX27_DT=y
  CONFIG_SOC_IMX25=y
  CONFIG_ARCH_ORION5X=y
@@@ -116,10 -110,11 +118,13 @@@ CONFIG_LEGACY_PTY_COUNT=1
  # CONFIG_DEVKMEM is not set
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
- CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+ CONFIG_SERIAL_8250_NR_UARTS=6
+ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
+ CONFIG_SERIAL_8250_EXTENDED=y
+ CONFIG_SERIAL_8250_MANY_PORTS=y
  CONFIG_SERIAL_OF_PLATFORM=y
 +CONFIG_SERIAL_IMX=y
 +CONFIG_SERIAL_IMX_CONSOLE=y
  # CONFIG_HW_RANDOM is not set
  CONFIG_I2C=y
  # CONFIG_I2C_COMPAT is not set
@@@ -141,9 -134,7 +146,8 @@@ CONFIG_SENSORS_LM75=
  CONFIG_SENSORS_LM85=y
  CONFIG_THERMAL=y
  CONFIG_KIRKWOOD_THERMAL=y
- CONFIG_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
 +CONFIG_IMX2_WDT=y
  # CONFIG_ABX500_CORE is not set
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y