summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-07-30 15:51:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-07-30 15:51:57 +0200
commit550c6b25c6ddb769cb858b6cbeae694706934564 (patch)
tree42109cbd525b6f8bb67cca281c0c1922ee406f99
parent02eaa2a7fbe256c0e070268957d6d4e5dd13c234 (diff)
minor m68k fix
-rw-r--r--target/linux/config/Config.in.kernel4
-rw-r--r--target/m68k/Makefile7
2 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 348498936..c4af33d63 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -138,7 +138,9 @@ config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
choice
prompt "Kernel Compression"
-depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI && \
+ !ADK_TARGET_SYSTEM_MIKROTIK_RB532 && \
+ !ADK_TARGET_SYSTEM_QEMU_M68K
config ADK_KERNEL_COMP_XZ
prompt "use XZ compression"
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 4c2776a4b..47e9b1510 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -27,6 +27,13 @@ ifeq ($(ADK_TARGET_FS),initramfs)
targethelp:
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
+ifeq ($(ADK_TARGET_QEMU),y)
+ @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+ @echo "Use following command to create a QEMU Image:"
+ @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
+ @echo "Start qemu with following options:"
+ @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
+endif
ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
@sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \
-e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \