From 7262228e92ff388f458c69ad12338757ef44dbc8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 12 Mar 2016 19:25:15 +0100 Subject: default to initramfs+piggyback for qemu/gdb sim --- target/config/Config.in.rootfs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'target/config/Config.in.rootfs') diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 1f98cbdbd..c1410e446 100644 --- a/target/config/Config.in.rootfs +++ b/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. -- cgit v1.2.3