Ver código fonte

default to initramfs+piggyback for qemu/gdb sim

Waldemar Brodkorb 8 anos atrás
pai
commit
7262228e92
1 arquivos alterados com 15 adições e 14 exclusões
  1. 15 14
      target/config/Config.in.rootfs

+ 15 - 14
target/config/Config.in.rootfs

@@ -4,14 +4,20 @@
 choice
 prompt "Firmware type" if !ADK_TARGET_CHOOSE_ARCH
 depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_OS_BAREMETAL
+default ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK if ADK_TARGET_QEMU || ADK_TARGET_SIM
 default ADK_TARGET_ROOTFS_ARCHIVE
 
-config ADK_TARGET_ROOTFS_INITRAMFS
-	bool "initramfs filesystem"
+config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
+	bool "initramfs filesystem included into kernel image"
+	select ADK_TARGET_ARCH_INITRAMFS_BUILTIN
 	depends on \
 		ADK_TARGET_QEMU || \
-		ADK_TARGET_ARCH_M68K || \
+		ADK_TARGET_SIM || \
+		ADK_TARGET_SYSTEM_OR1K_SIM || \
+		ADK_TARGET_ARCH_AARCH64 || \
+		ADK_TARGET_ARCH_ARC || \
 		ADK_TARGET_ARCH_ARM || \
+		ADK_TARGET_ARCH_M68K || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
 		ADK_TARGET_ARCH_PPC || \
@@ -21,23 +27,15 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 		ADK_TARGET_ARCH_X86_64
 	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
-	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
-	depends on !ADK_TARGET_SYSTEM_QEMU_METAG
-	select ADK_KERNEL_BLK_DEV_INITRD
 	help
 	  create an read-only initramfs system.
 
-config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
-	bool "initramfs filesystem included into kernel image"
-	select ADK_TARGET_ARCH_INITRAMFS_BUILTIN
+config ADK_TARGET_ROOTFS_INITRAMFS
+	bool "initramfs filesystem"
 	depends on \
 		ADK_TARGET_QEMU || \
-		ADK_TARGET_SIM || \
-		ADK_TARGET_SYSTEM_OR1K_SIM || \
-		ADK_TARGET_ARCH_AARCH64 || \
-		ADK_TARGET_ARCH_ARC || \
-		ADK_TARGET_ARCH_ARM || \
 		ADK_TARGET_ARCH_M68K || \
+		ADK_TARGET_ARCH_ARM || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
 		ADK_TARGET_ARCH_PPC || \
@@ -47,6 +45,9 @@ config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
 		ADK_TARGET_ARCH_X86_64
 	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
+	depends on !ADK_TARGET_SYSTEM_QEMU_METAG
+	select ADK_KERNEL_BLK_DEV_INITRD
 	help
 	  create an read-only initramfs system.