summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-12-26 11:41:04 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-12-26 11:41:04 +0100
commit0cb8ada4f1a8a4a0f69fbcab2497cebb8121683a (patch)
tree95006f6b0f00570f9ff8099bbb89220109659d76
parent7ccb39d5b384f0f3af0c17f5eec67148f0e65973 (diff)
more generic config fixes reported via irc
-rw-r--r--target/config/Config.in.runtime17
-rw-r--r--target/linux/config/Config.in.bus3
2 files changed, 13 insertions, 7 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index e0527d78f..0b3832673 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -219,18 +219,21 @@ prompt "bootup messages from kernel"
config ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY
bool "output via VGA only"
- depends on ADK_TARGET_WITH_VGA
+ depends on ADK_TARGET_WITH_VGA \
+ || ADK_TARGET_GENERIC
config ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY
bool "output via serial console only"
depends on ADK_TARGET_WITH_SERIAL \
|| ADK_TARGET_QEMU \
- || ADK_TARGET_SIM
+ || ADK_TARGET_SIM \
+ || ADK_TARGET_GENERIC
config ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL
bool "output via VGA and serial console"
depends on ADK_TARGET_WITH_SERIAL && \
- ADK_TARGET_WITH_VGA
+ ADK_TARGET_WITH_VGA || \
+ ADK_TARGET_GENERIC
help
Output is via VGA and serial console.
Init can use only serial via /dev/console.
@@ -238,7 +241,8 @@ config ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL
config ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA
bool "output via serial console and VGA"
depends on ADK_TARGET_WITH_SERIAL && \
- ADK_TARGET_WITH_VGA
+ ADK_TARGET_WITH_VGA || \
+ ADK_TARGET_GENERIC
help
Output is via serial console and VGA.
Init can use only VGA via /dev/console.
@@ -257,7 +261,7 @@ default ADK_RUNTIME_VERBOSE_INIT_SERIAL
config ADK_RUNTIME_VERBOSE_INIT_VGA
bool "output via VGA"
- depends on ADK_TARGET_WITH_VGA
+ depends on ADK_TARGET_WITH_VGA || ADK_TARGET_GENERIC
depends on ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA || \
ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY || \
ADK_RUNTIME_QUIET_KERNEL
@@ -266,7 +270,8 @@ config ADK_RUNTIME_VERBOSE_INIT_SERIAL
bool "output via serial"
depends on ADK_TARGET_WITH_SERIAL \
|| ADK_TARGET_QEMU \
- || ADK_TARGET_SIM
+ || ADK_TARGET_SIM \
+ || ADK_TARGET_GENERIC
depends on ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL || \
ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY || \
ADK_RUNTIME_QUIET_KERNEL
diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus
index 4ac0a2b0e..dc1ecce07 100644
--- a/target/linux/config/Config.in.bus
+++ b/target/linux/config/Config.in.bus
@@ -6,7 +6,8 @@ config ADK_KERNEL_PCI
select ADK_KERNEL_PCI_QUIRKS
depends on ADK_TARGET_WITH_PCI \
|| ADK_TARGET_QEMU \
- || ADK_TARGET_VBOX
+ || ADK_TARGET_VBOX \
+ || ADK_TARGET_GENERIC
default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
default n if ADK_TARGET_CPU_XTENSA_DE212
default y