diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
| commit | 407f9b8fde3ad9cc55f39f7a548cde6056dab494 (patch) | |
| tree | 0375ea8ddab3502bf6883066f43fc7e328d5c704 /target/microblaze/Makefile | |
| parent | 2ecefcf609e484d04d1546581191831e07ad71ec (diff) | |
| parent | abb858ae43374dc13a5fcef19b9e0ba9442013bb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/microblaze/Makefile')
| -rw-r--r-- | target/microblaze/Makefile | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 3ff728627..e4c98ed6d 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -9,16 +9,36 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) -ifeq ($(ADK_TARGET_FS),archive) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" +tools-compile: + $(MAKE) -C ../tools/mtd-utils all + $(MAKE) -C ../tools/xz all + $(MAKE) -C ../tools/squashfs all + +ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) +MODEL:=petalogix-ml605 +DTB:=-dtb target/microblaze/ml605.dtb +endif +ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) +MODEL:=petalogix-s3adsp1800 +DTB:= +endif + +ifeq ($(ADK_TARGET_FS),squashfs) +imageinstall: tools-compile $(BUILD_DIR)/root.squashfs + qemu-img create -f raw $(BIN_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) + dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(BIN_DIR)/$(ROOTFSSQUASHFS) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) + @echo "Start qemu with following options:" + @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -pflash $(BIN_DIR)/$(ROOTFSSQUASHFS)' +endif +endif +ifeq ($(ADK_TARGET_FS),jffs2) +imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) - @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' - @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" +ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -pflash $(BIN_DIR)/$(ROOTFSJFFS2)' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -28,7 +48,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -37,6 +57,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif endif |