[Qemu-devel] [PATCH 8/9] unicore32-softmmu: add config and makefile support

[Guan Xuetao]

This patch adds configure and makefile support for unicore32-softmmu.
All puv3-soc devices are put into hw/pkunity directory, so this dir
will be added when unicore32-softmmu is selected.

Signed-off-by: Guan Xuetao <address@hidden>
---
 Makefile.target                       |    5 +++++
 arch_init.c                           |    2 ++
 arch_init.h                           |    1 +
 configure                             |    4 ++++
 default-configs/unicore32-softmmu.mak |    4 ++++
 5 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 default-configs/unicore32-softmmu.mak

diff --git a/Makefile.target b/Makefile.target
index 1582904..2f850d3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -387,6 +387,11 @@ obj-xtensa-y += core-dc232b.o
 obj-xtensa-y += core-dc233c.o
 obj-xtensa-y += core-fsf.o
 
+obj-unicore32-y += uc32_softmmu.o
+obj-unicore32-y += pkunity/puv3.o
+obj-unicore32-y += pkunity/puv3_intc.o pkunity/puv3_ost.o pkunity/puv3_gpio.o
+obj-unicore32-y += pkunity/puv3_pm.o pkunity/puv3_dma.o
+
 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
 
 monitor.o: hmp-commands.h qmp-commands-old.h
diff --git a/arch_init.c b/arch_init.c
index 988adca..9314025 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -81,6 +81,8 @@ int graphic_depth = 15;
 #define QEMU_ARCH QEMU_ARCH_SPARC
 #elif defined(TARGET_XTENSA)
 #define QEMU_ARCH QEMU_ARCH_XTENSA
+#elif defined(TARGET_UNICORE32)
+#define QEMU_ARCH QEMU_ARCH_UNICORE32
 #endif
 
 const uint32_t arch_type = QEMU_ARCH;
diff --git a/arch_init.h b/arch_init.h
index c7cb94a..5298139 100644
--- a/arch_init.h
+++ b/arch_init.h
@@ -16,6 +16,7 @@ enum {
     QEMU_ARCH_SH4 = 1024,
     QEMU_ARCH_SPARC = 2048,
     QEMU_ARCH_XTENSA = 4096,
+    QEMU_ARCH_UNICORE32 = 8192,
 };
 
 extern const uint32_t arch_type;
diff --git a/configure b/configure
index b55a792..e4a7c3a 100755
--- a/configure
+++ b/configure
@@ -934,6 +934,7 @@ sparc64-softmmu \
 s390x-softmmu \
 xtensa-softmmu \
 xtensaeb-softmmu \
+unicore32-softmmu \
 "
 fi
 # the following are Linux specific
@@ -3504,6 +3505,9 @@ mkdir -p $target_dir/kvm
 if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o 
"$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
   mkdir -p $target_dir/nwfpe
 fi
+if test "$target" = "unicore32-softmmu" ; then
+  mkdir -p $target_dir/pkunity
+fi
 symlink "$source_path/Makefile.target" "$target_dir/Makefile"
 
 
diff --git a/default-configs/unicore32-softmmu.mak 
b/default-configs/unicore32-softmmu.mak
new file mode 100644
index 0000000..7508f75
--- /dev/null
+++ b/default-configs/unicore32-softmmu.mak
@@ -0,0 +1,4 @@
+# Default configuration for unicore32-softmmu
+
+CONFIG_PTIMER=y
+CONFIG_PCKBD=y
-- 
1.7.0.4