diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 20:16:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 20:16:13 +0100 |
| commit | 2d79a4d91d7f403a60cc2452fb96ec7bc0876535 (patch) | |
| tree | b3d5071c4b0f73426a00a82f239b750346313781 /target/linux | |
| parent | 777ba90340ac177369918daf0f66a27f97a8d911 (diff) | |
| parent | 803b9757e040cc1a9090de4ac5572290c83d31fe (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.debug | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 23c0bd8d2..019c439d8 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -30,7 +30,7 @@ config ADK_KERNEL_EARLY_PRINTK default n config ADK_KERNEL_PRINTK - prompt "Enable printk to save space and quieten bootup" + prompt "printk support (disable to save space and quieten bootup)" boolean select ADK_KERNEL_EARLY_PRINTK default y @@ -39,7 +39,7 @@ config ADK_KERNEL_PRINTK Disable printk to save space and quieten bootup. config ADK_KERNEL_PRINTK_TIME - prompt "Enable timing information for printk" + prompt "timing information for printk" boolean depends on ADK_KERNEL_PRINTK default n diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 221a373df..650bc8729 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -98,7 +98,7 @@ config ADK_KERNEL_PCI config ADK_KERNEL_64BIT boolean - default y if ADK_TARGET_KERNEL64 + default y if ADK_LINUX_64 config ADK_KERNEL_CPU_MIPS64 boolean @@ -106,6 +106,9 @@ config ADK_KERNEL_CPU_MIPS64 config ADK_KERNEL_CPU_MIPS64_R1 boolean +config ADK_KERNEL_CPU_MIPS64_R2 + boolean + config ADK_KERNEL_PREEMPT boolean |