summaryrefslogtreecommitdiff
path: root/target/xtensa
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-08-12 10:50:18 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-08-12 10:51:36 +0200
commitddb5d9774a5341b85986217939da0f8a35513024 (patch)
tree51fac3fdff4c34b5667268a1d1e1e899b7c6460f /target/xtensa
parent66abdde90cb03cfb95978d3b5fecb74110367b66 (diff)
add support for xtensa dc233c variant. use uImage, which works with a patched Qemu. Thanks to Max Filippov for fixes and ideas.
Diffstat (limited to 'target/xtensa')
-rw-r--r--target/xtensa/Makefile16
-rw-r--r--target/xtensa/kernel/qemu-xtensa1
-rw-r--r--target/xtensa/overlay/xtensa_dc233c.tarbin0 -> 808960 bytes
-rw-r--r--target/xtensa/systems/qemu-xtensa1
4 files changed, 9 insertions, 9 deletions
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
Binary files differ
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.