diff options
author | David Daney <david.daney@cavium.com> | 2013-06-19 16:37:29 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-01 09:10:55 -0400 |
commit | 1afb49d0e6429ba3997a3dfccb281bc473c4543e (patch) | |
tree | 13aa1932b616288076b09e30eadf3c9bf459bfda | |
parent | fde179901e2ebe55ebbbd4c635e1fff322640f7d (diff) |
MIPS: Update cavium_octeon_defconfig
The serial port changes make it advisable to enable the proper UART
drivers.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/5518/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/configs/cavium_octeon_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig index 1888e5f4d598..dace58268ce1 100644 --- a/arch/mips/configs/cavium_octeon_defconfig +++ b/arch/mips/configs/cavium_octeon_defconfig | |||
@@ -1,13 +1,11 @@ | |||
1 | CONFIG_CAVIUM_OCTEON_SOC=y | 1 | CONFIG_CAVIUM_OCTEON_SOC=y |
2 | CONFIG_CAVIUM_CN63XXP1=y | 2 | CONFIG_CAVIUM_CN63XXP1=y |
3 | CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2 | 3 | CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2 |
4 | CONFIG_SPARSEMEM_MANUAL=y | ||
5 | CONFIG_TRANSPARENT_HUGEPAGE=y | 4 | CONFIG_TRANSPARENT_HUGEPAGE=y |
6 | CONFIG_SMP=y | 5 | CONFIG_SMP=y |
7 | CONFIG_NR_CPUS=32 | 6 | CONFIG_NR_CPUS=32 |
8 | CONFIG_HZ_100=y | 7 | CONFIG_HZ_100=y |
9 | CONFIG_PREEMPT=y | 8 | CONFIG_PREEMPT=y |
10 | CONFIG_EXPERIMENTAL=y | ||
11 | CONFIG_SYSVIPC=y | 9 | CONFIG_SYSVIPC=y |
12 | CONFIG_POSIX_MQUEUE=y | 10 | CONFIG_POSIX_MQUEUE=y |
13 | CONFIG_BSD_PROCESS_ACCT=y | 11 | CONFIG_BSD_PROCESS_ACCT=y |
@@ -50,7 +48,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
50 | # CONFIG_FW_LOADER is not set | 48 | # CONFIG_FW_LOADER is not set |
51 | CONFIG_MTD=y | 49 | CONFIG_MTD=y |
52 | # CONFIG_MTD_OF_PARTS is not set | 50 | # CONFIG_MTD_OF_PARTS is not set |
53 | CONFIG_MTD_CHAR=y | ||
54 | CONFIG_MTD_BLOCK=y | 51 | CONFIG_MTD_BLOCK=y |
55 | CONFIG_MTD_CFI=y | 52 | CONFIG_MTD_CFI=y |
56 | CONFIG_MTD_CFI_AMDSTD=y | 53 | CONFIG_MTD_CFI_AMDSTD=y |
@@ -114,6 +111,7 @@ CONFIG_SERIAL_8250=y | |||
114 | CONFIG_SERIAL_8250_CONSOLE=y | 111 | CONFIG_SERIAL_8250_CONSOLE=y |
115 | CONFIG_SERIAL_8250_NR_UARTS=2 | 112 | CONFIG_SERIAL_8250_NR_UARTS=2 |
116 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 113 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
114 | CONFIG_SERIAL_8250_DW=y | ||
117 | # CONFIG_HW_RANDOM is not set | 115 | # CONFIG_HW_RANDOM is not set |
118 | CONFIG_I2C=y | 116 | CONFIG_I2C=y |
119 | CONFIG_I2C_OCTEON=y | 117 | CONFIG_I2C_OCTEON=y |