summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/cavium_octeon_defconfig
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2013-06-19 20:37:29 +0000
committerRalf Baechle <ralf@linux-mips.org>2013-07-01 15:10:55 +0200
commit1afb49d0e6429ba3997a3dfccb281bc473c4543e (patch)
tree13aa1932b616288076b09e30eadf3c9bf459bfda /arch/mips/configs/cavium_octeon_defconfig
parentfde179901e2ebe55ebbbd4c635e1fff322640f7d (diff)
downloadblackbird-obmc-linux-1afb49d0e6429ba3997a3dfccb281bc473c4543e.tar.gz
blackbird-obmc-linux-1afb49d0e6429ba3997a3dfccb281bc473c4543e.zip
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>
Diffstat (limited to 'arch/mips/configs/cavium_octeon_defconfig')
-rw-r--r--arch/mips/configs/cavium_octeon_defconfig4
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 @@
CONFIG_CAVIUM_OCTEON_SOC=y
CONFIG_CAVIUM_CN63XXP1=y
CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
-CONFIG_SPARSEMEM_MANUAL=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32
CONFIG_HZ_100=y
CONFIG_PREEMPT=y
-CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
@@ -50,7 +48,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
# CONFIG_MTD_OF_PARTS is not set
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_AMDSTD=y
@@ -114,6 +111,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_DW=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_OCTEON=y
OpenPOWER on IntegriCloud