diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:25:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:25:54 +0200 |
| commit | 2cbb21d749efb9ca1eef04f04d189d4961b33b79 (patch) | |
| tree | 9247e91a955e09c9e396d96592a9f7f0c8f03ca2 /arch/arm/configs/multi_v5_defconfig | |
| parent | 11d708f414a78b8e2903cbcff34bec69c73ba1b5 (diff) | |
| parent | d0bc3483da8774dcea1e0692586830031783f08c (diff) | |
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
Diffstat (limited to 'arch/arm/configs/multi_v5_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index a822dd346fb2..ccafa84aedfe 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -13,6 +13,8 @@ CONFIG_MODULE_UNLOAD=y # 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 @@ -116,7 +118,10 @@ 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_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 @@ -141,7 +146,6 @@ CONFIG_SENSORS_LM75=y 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 |