3 files changed, 25 insertions, 10 deletions
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index 49dfee734..20c2814b0 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -29,6 +29,25 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 endchoice
 
 choice
+prompt "Qemu XTENSA Emulation"
+depends on ADK_TARGET_SYSTEM_QEMU_XTENSA
+
+config ADK_TARGET_QEMU_XTENSA_DC232B
+	boolean "dc232b"
+	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+
+config ADK_TARGET_QEMU_XTENSA_DC233C
+	boolean "dc233c"
+	select ADK_KERNEL_XTENSA_VARIANT_DC233C
+
+endchoice
+
+config ADK_TARGET_XTENSA
+	string
+	default "dc233c" if ADK_TARGET_QEMU_XTENSA_DC233C
+	default "dc232b" if ADK_TARGET_QEMU_XTENSA_DC232B
+
+choice
 prompt "Qemu ARM Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 0ca3ec842..a302bedab 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -110,4 +110,6 @@ config ADK_TARGET_QEMU_WITH_AUDIO
 	boolean "enabled"
 
 endchoice
+
+
 endmenu
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 3ef48ab3e..e1f65e5d2 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -31,6 +31,10 @@ config ADK_HOST_BUILD_LIBTOOL
 	boolean
 	default y
 
+config ADK_HOST_BUILD_U_BOOT
+	boolean
+	default y
+
 # always required, but can be provided by host
 config ADK_HOST_BUILD_BASH
 	boolean
@@ -143,16 +147,6 @@ config ADK_HOST_BUILD_QEMU
 	default n
 
 # optional, must be used from OpenADK
-config ADK_HOST_NEED_MKIMAGE
-	boolean
-	default n
-
-config ADK_HOST_BUILD_MKIMAGE
-	boolean
-	select ADK_PACKAGE_U_BOOT
-	default y if ADK_HOST_NEED_MKIMAGE
-	default n
-
 config ADK_HOST_NEED_MTD_UTILS
 	boolean
 	default n