summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-03 11:27:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-03 11:27:38 +0200
commit97f06c7f9d934a86f84f6608bcf3c6a1a1132eee (patch)
treeb4391721c33a97aefdbd0ecff73dc1e43d50b557 /target
parentcf494122e89c1f3674079ad3de3604f8d8e94b0b (diff)
add qemu host dependency
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in1
-rw-r--r--target/config/Config.in.tools8
-rw-r--r--target/microblaze/Makefile2
3 files changed, 10 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 1255ceae3..501039ed1 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -771,6 +771,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
bool "Compressed read-only root filesystem (squashfs)"
select ADK_KERNEL_SQUASHFS
select ADK_HOST_NEED_SQUASHFS
+ select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU
select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
depends on ADK_TARGET_WITH_MTD
help
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 95e4f6d63..f95a4508b 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -97,6 +97,14 @@ config ADK_HOST_BUILD_MKSH
boolean
default n
+config ADK_HOST_NEED_QEMU
+ boolean
+ default n
+
+config ADK_HOST_BUILD_QEMU
+ boolean
+ default n
+
config ADK_HOST_NEED_SYSLINUX
boolean
default n
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 58d02c5be..4a39e1c3b 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -18,7 +18,7 @@ endif
ifeq ($(ADK_TARGET_FS),squashfs)
imageinstall: $(BUILD_DIR)/root.squashfs
- qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE)
+ env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE)
dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS)
@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
ifneq ($(ADK_HARDWARE_QEMU),)