diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-23 20:56:54 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-23 21:27:51 +0200 |
commit | 4c7e914580ff3014a015d4f1eb0cd4e108e87f68 (patch) | |
tree | 2a6395f48d76d1f62115c2cf8900871e65fee6b1 /target/ppc | |
parent | f9c3a55a887ed486670b62f62d6e136ac14a9ed0 (diff) |
add qemu support for ppc virtex ml507
Diffstat (limited to 'target/ppc')
-rw-r--r-- | target/ppc/Makefile | 27 | ||||
-rw-r--r-- | target/ppc/kernel/qemu-ppc | 30 | ||||
-rw-r--r-- | target/ppc/systems/qemu-ppc | 1 |
3 files changed, 25 insertions, 33 deletions
diff --git a/target/ppc/Makefile b/target/ppc/Makefile index 3268dbc6e..60e7f1fc5 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -10,9 +10,14 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id -QEMU_ARGS:=-M mac99 -QEMU_ARGS+=${ADK_QEMU_ARGS} +QEMU_ARGS:=${ADK_QEMU_ARGS} +ifeq ($(ADK_TARGET_QEMU_PPC_MACPPC),y) +QEMU_ARGS+=-M macppc QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 +endif +ifeq ($(ADK_TARGET_QEMU_PPC_VIRTEX_ML507),y) +QEMU_ARGS+=-M virtex-ml507 -m 256 -dtb $(FW_DIR)/ppc.dtb +endif # target helper text ifeq ($(ADK_TARGET_FS),archive) @@ -56,16 +61,34 @@ kernel-strip: kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} +dtb-install: + env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ + -j${ADK_MAKE_JOBS} virtex440-ml507.dtb $(MAKE_TRACE) + $(CP) $(LINUX_DIR)/arch/powerpc/boot/virtex440-ml507.dtb \ + $(FW_DIR)/ppc.dtb + # filesystem specific targets ifeq ($(ADK_TARGET_FS),archive) +ifeq ($(ADK_TARGET_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) +imageinstall: dtb-install kernel-install $(FW_DIR)/$(INITRAMFS) targethelp +else imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif +endif 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) +imageinstall: dtb-install createinitramfs targethelp +else imageinstall: createinitramfs targethelp endif +endif diff --git a/target/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc deleted file mode 100644 index b18e0e2d4..000000000 --- a/target/ppc/kernel/qemu-ppc +++ /dev/null @@ -1,30 +0,0 @@ -CONFIG_PPC=y -CONFIG_PPC32=y -CONFIG_32BIT=y -CONFIG_PPC_BOOK3S_32=y -CONFIG_PPC_BOOK3S=y -CONFIG_6xx=y -CONFIG_PPC_FPU=y -CONFIG_ALTIVEC=y -CONFIG_PPC_STD_MMU=y -CONFIG_PPC_STD_MMU_32=y -CONFIG_WORD_SIZE=32 -CONFIG_GENERIC_NVRAM=y -CONFIG_PPC_OF=y -CONFIG_PPC_UDBG_16550=y -CONFIG_PPC_CHRP=y -CONFIG_PPC_PMAC=y -CONFIG_PPC_NATIVE=y -CONFIG_PPC_OF_BOOT_TRAMPOLINE=y -CONFIG_MPIC=y -CONFIG_PPC_I8259=y -CONFIG_PPC_RTAS=y -CONFIG_PPC_MPC106=y -CONFIG_PPC_4K_PAGES=y -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_ADB=y -CONFIG_ADB_CUDA=y -CONFIG_INPUT_ADBHID=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y diff --git a/target/ppc/systems/qemu-ppc b/target/ppc/systems/qemu-ppc index 835741934..9d7217bbc 100644 --- a/target/ppc/systems/qemu-ppc +++ b/target/ppc/systems/qemu-ppc @@ -2,7 +2,6 @@ config ADK_TARGET_SYSTEM_QEMU_PPC bool "Qemu Emulator" select ADK_ppc select ADK_qemu_ppc - select ADK_CPU_PPC select ADK_TARGET_QEMU help Support for Qemu Emulator PPC architecture. |