فهرست منبع

some m68k fixes. init is now found.

Waldemar Brodkorb 9 سال پیش
والد
کامیت
fd885dbb0e
3فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 4 0
      target/Makefile
  2. 1 2
      target/linux/config/Config.in.kernel
  3. 3 6
      target/m68k/Makefile

+ 4 - 0
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

+ 1 - 2
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"

+ 3 - 6
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)#" \