summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-08-02 22:10:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-08-02 22:10:50 +0200
commit8357a002097876a8d29f30d97135983a33b56971 (patch)
tree878bc31db33204e49c0ec20259c2a196fffa24fa
parentf20cc753998dfb4e273a7f12c7e05fd5bab7eaef (diff)
separate serial drivers, add builtin dtb. still no shell
-rw-r--r--target/linux/config/Config.in.serial12
-rw-r--r--target/metag/kernel/qemu-metag4
-rw-r--r--toolchain/gcc/Makefile2
3 files changed, 15 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index a15a9fad3..c5e7dcded 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -22,6 +22,18 @@ config ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE
config ADK_KERNEL_SERIAL_SH_SCI_CONSOLE
bool
+config ADK_KERNEL_DA_CONSOLE
+ bool
+
+config ADK_KERNEL_DA_TTY
+ bool "METAG serial driver"
+ select ADK_KERNEL_DA_CONSOLE
+ depends on ADK_TARGET_SYSTEM_QEMU_METAG
+ default y if ADK_TARGET_SYSTEM_QEMU_METAG
+ default n
+ help
+ Serial driver for Qemu METAG Emulation.
+
config ADK_KERNEL_SERIAL_ETRAXFS
bool "ETRAXFS serial driver"
select ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE
diff --git a/target/metag/kernel/qemu-metag b/target/metag/kernel/qemu-metag
index 6c45bc1ca..f98da3d66 100644
--- a/target/metag/kernel/qemu-metag
+++ b/target/metag/kernel/qemu-metag
@@ -2,6 +2,6 @@ CONFIG_METAG=y
CONFIG_SOC_TZ1090=y
CONFIG_METAG_DA=y
CONFIG_METAG_META21_MMU=y
+CONFIG_METAG_BUILTIN_DTB=y
CONFIG_METAG_UNALIGNED=y
-CONFIG_DA_TTY=y
-CONFIG_DA_CONSOLE=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 24b871025..6c4b0e2e2 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -115,7 +115,7 @@ GCC_CONFOPTS+= --with-mode=thumb
endif
ifeq ($(ADK_TARGET_ARCH_METAG),y)
-GCC_CONFOPTS+= --enable-meta-default
+GCC_CONFOPTS+= --with-cpu=2.1 --enable-meta-default --disable-symvers
endif
ifeq ($(ADK_CPU_CF),y)