From 46f07863b1ef718701e6e654c09f5e5b591e4138 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Sep 2015 08:05:26 +0200 Subject: move serial to driver config, enable cmdline --- target/linux/config/Config.in.serial | 34 ++++++++++++++++++---------------- target/mips/kernel/mikrotik-rb532 | 3 +-- 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'target') diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 2e23f653d..5579336fb 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -31,6 +31,24 @@ config ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE config ADK_KERNEL_DA_CONSOLE bool +config ADK_KERNEL_SERIAL_8250 + bool "8250 serial driver" + select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ + || ADK_TARGET_SYSTEM_QEMU_OR1K + select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU + select ADK_KERNEL_SERIAL_8250_CONSOLE + depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ + || ADK_TARGET_SYSTEM_PCENGINES_APU \ + || ADK_TARGET_SYSTEM_QEMU_OR1K \ + || ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 + default y if ADK_TARGET_SYSTEM_PCENGINES_APU + default y if ADK_TARGET_SYSTEM_QEMU_OR1K + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default n + help + Serial driver for 8250 UART chip. + config ADK_KERNEL_DA_TTY bool "METAG serial driver" select ADK_KERNEL_DA_CONSOLE @@ -49,22 +67,6 @@ config ADK_KERNEL_SERIAL_ETRAXFS help Serial driver for ETRAXFS CRISv32 Qemu Emulation. -config ADK_KERNEL_SERIAL_8250 - bool "8250 serial driver" - select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ - || ADK_TARGET_SYSTEM_QEMU_OR1K - select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU - select ADK_KERNEL_SERIAL_8250_CONSOLE - depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ - || ADK_TARGET_SYSTEM_PCENGINES_APU \ - || ADK_TARGET_SYSTEM_QEMU_OR1K - default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 - default y if ADK_TARGET_SYSTEM_PCENGINES_APU - default y if ADK_TARGET_SYSTEM_QEMU_OR1K - default n - help - Serial driver for 8250 UART chip. - config ADK_KERNEL_SERIAL_AMBA_PL011 bool "AMBA PL011 serial driver" select ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE diff --git a/target/mips/kernel/mikrotik-rb532 b/target/mips/kernel/mikrotik-rb532 index 8162e7619..a2d371e15 100644 --- a/target/mips/kernel/mikrotik-rb532 +++ b/target/mips/kernel/mikrotik-rb532 @@ -1,5 +1,4 @@ CONFIG_MIPS=y CONFIG_MIKROTIK_RB532=y CONFIG_CPU_MIPS32_R1=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_CMDLINE_BOOL=y -- cgit v1.2.3