From fd885dbb0e775ac5349a19e93c4d3c745ec63249 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 14 Aug 2014 08:33:30 +0200
Subject: some m68k fixes. init is now found.

---
 target/Makefile                      | 4 ++++
 target/linux/config/Config.in.kernel | 3 +--
 target/m68k/Makefile                 | 9 +++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'target')

diff --git a/target/Makefile b/target/Makefile
index 894d7b72a..ef0c4851a 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -36,6 +36,10 @@ config-prepare: $(ADK_TOPDIR)/.config
 		echo "no miniconfig found for target system"; \
 		exit 1; \
 	fi
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y)
+	@PATH=$(HOST_PATH) sed -i -e 's#^\(CONFIG_.*BOOTPARAM_STRING="\)\(.*\)"#\1\2 ro ${FS_CMDLINE}"#' \
+		${BUILD_DIR}/.kernelconfig.board
+endif
 ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),)
 	@PATH=$(HOST_PATH) sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \
 		${BUILD_DIR}/.kernelconfig.board
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index cf4a7a1c1..e3906cf9a 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -130,8 +130,7 @@ config ADK_KERNEL_CPU_LITTLE_ENDIAN
 
 choice
 prompt "Kernel Compression"
-depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 && \
-	   !ADK_TARGET_SYSTEM_QEMU_M68K
+depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 
 config ADK_KERNEL_COMP_XZ
 	prompt "use XZ compression"
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index addf809b1..8e64dc764 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -18,7 +18,7 @@ targethelp:
 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 "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 	@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
@@ -28,11 +28,8 @@ 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'
+	@echo "Start qemu with following command line:"
+	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
 	@sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \
-- 
cgit v1.2.3