add support for xtensa dc233c variant. use uImage, which works with a patched Qemu. Thanks to Max Filippov for fixes and ideas.

10 files changed, 44 insertions, 19 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
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 9d24c537d..b4606ead8 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -16,6 +16,7 @@ source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
 source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.mips
+source target/linux/config/Config.in.xtensa
 source target/linux/config/Config.in.pm
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.virtio
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 38b1f20f1..e3965123c 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -22,6 +22,9 @@ config ADK_KERNEL_EARLY_PRINTK
 	boolean
 	default n
 
+config ADK_KERNEL_KALLSYMS_ALL
+	boolean
+
 config ADK_KERNEL_PRINTK
 	prompt "printk support (disable to save space and quieten bootup)"
 	boolean
@@ -128,6 +131,7 @@ config ADK_KERNEL_OPROFILE
 config ADK_KERNEL_KALLSYMS
 	prompt "Support for symbol names in OOPS"
 	boolean
+	select ADK_KERNEL_KALLSYMS_ALL
 	default n
 	help
 	 Load all symbols to the kernel.
diff --git a/target/linux/config/Config.in.xtensa b/target/linux/config/Config.in.xtensa
new file mode 100644
index 000000000..1dc2ed7b0
--- /dev/null
+++ b/target/linux/config/Config.in.xtensa
@@ -0,0 +1,5 @@
+config ADK_KERNEL_XTENSA_VARIANT_DC233C
+	boolean
+
+config ADK_KERNEL_XTENSA_VARIANT_DC232B
+	boolean
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 42ab2ab9a..3760ebff4 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -9,8 +9,14 @@ include $(ADK_TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
 
-QEMU_ARGS:=-M lx60 -cpu dc232b -monitor null
+QEMU_ARGS:=-M lx60 -monitor null
 QEMU_ARGS+=${ADK_QEMU_ARGS}
+ifeq ($(ADK_TARGET_QEMU_XTENSA_DC233C),y)
+QEMU_ARGS+=-cpu dc233c
+endif
+ifeq ($(ADK_TARGET_QEMU_XTENSA_DC232B),y)
+QEMU_ARGS+=-cpu dc232b
+endif
 
 # target helper text
 ifeq ($(ADK_TARGET_FS),archive)
@@ -47,12 +53,8 @@ ifeq ($(ADK_TARGET_QEMU),y)
 endif
 endif
 
-# image creation and kernel install
-kernel-strip:
-	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-
-kernel-install: kernel-strip
-	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
+kernel-install:
+	@cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/xtensa/kernel/qemu-xtensa b/target/xtensa/kernel/qemu-xtensa
index a8a980be1..c7a401380 100644
--- a/target/xtensa/kernel/qemu-xtensa
+++ b/target/xtensa/kernel/qemu-xtensa
@@ -1,5 +1,4 @@
 CONFIG_XTENSA=y
-CONFIG_XTENSA_VARIANT_DC232B=y
 CONFIG_XTENSA_PLATFORM_XTFPGA=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_8250=y
diff --git a/target/xtensa/overlay/xtensa_dc233c.tar b/target/xtensa/overlay/xtensa_dc233c.tar
new file mode 100644
index 000000000..56ccc5b31
--- /dev/null
+++ b/target/xtensa/overlay/xtensa_dc233c.tar
diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa
index b40750069..d7b3501d3 100644
--- a/target/xtensa/systems/qemu-xtensa
+++ b/target/xtensa/systems/qemu-xtensa
@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_XTENSA
 	select ADK_qemu_xtensa
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_HOST_NEED_MKIMAGE
 	help
 	 Support for Qemu Emulator XTENSA architecture.