4 files changed, 22 insertions, 12 deletions
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 7195753dc..64660ef59 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -9,14 +9,14 @@ KERNEL:=$(LINUX_DIR)/vmlinux
 OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_PPC_MACPPC),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC),y)
 QEMU_ARGS+=-M mac99
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 endif
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 QEMU_ARGS+=-M virtex-ml507 -m 256 -dtb $(FW_DIR)/ppc.dtb
 endif
-ifeq ($(ADK_TARGET_QEMU_PPC_BAMBOO),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO),y)
 QEMU_ARGS+=-M bamboo
 QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0
 endif
@@ -76,14 +76,14 @@ dtb-install:
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 else
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install kernel-install $(FW_DIR)/$(INITRAMFS) targethelp
 else
 imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp
@@ -93,7 +93,7 @@ ifeq ($(ADK_TARGET_FS),initramfsarchive)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
-ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
 imageinstall: dtb-install createinitramfs targethelp
 else
 imageinstall: createinitramfs targethelp
diff --git a/target/ppc/systems/qemu-ppc b/target/ppc/systems/qemu-ppc
deleted file mode 100644
index d2c4086de..000000000
--- a/target/ppc/systems/qemu-ppc
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_PPC
-	bool "Qemu Emulator"
-	select ADK_TARGET_QEMU
-	help
-	 Support for Qemu Emulator PPC architecture.
-
diff --git a/target/ppc/systems/qemu-ppc-bamboo b/target/ppc/systems/qemu-ppc-bamboo
new file mode 100644
index 000000000..24d231205
--- /dev/null
+++ b/target/ppc/systems/qemu-ppc-bamboo
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
+	bool "Qemu Emulator (Bamboo)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_PPC_440
+	select ADK_TARGET_SOFT_FLOAT
+	help
+	 Support for Qemu Emulator PPC architecture (Bamboo).
+
diff --git a/target/ppc/systems/qemu-ppc-macppc b/target/ppc/systems/qemu-ppc-macppc
new file mode 100644
index 000000000..2e9ba1a4f
--- /dev/null
+++ b/target/ppc/systems/qemu-ppc-macppc
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
+	bool "Qemu Emulator (MAC-PPC)"
+	select ADK_TARGET_QEMU
+	select ADK_CPU_PPC
+	select ADK_TARGET_CPU_WITH_FPU
+	help
+	 Support for Qemu Emulator PPC architecture (MAC-PPC).
+