From 7bd985bf406b637ffd422e0d7d85cd0a72021b02 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 04:11:17 +0200 Subject: add generic pc --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 501039ed1..25e34c9cd 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -210,6 +210,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC config ADK_QEMU_ARGS string -- cgit v1.2.3 From 3491bf306b439d2acc9dcde8eb23e82482c59c4d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 05:43:57 +0200 Subject: add qemu-i486 --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 25e34c9cd..ce1adefac 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -204,6 +204,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32 + default "qemu-i486" if ADK_TARGET_SYSTEM_QEMU_I486 default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I -- cgit v1.2.3 From aa9a46d40ae76b926880ff36b1bb7d27f52b55ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Apr 2014 20:52:49 +0200 Subject: use one kernel config --- target/config/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index ce1adefac..2bcb4751b 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -202,9 +202,8 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_I486 default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32 - default "qemu-i486" if ADK_TARGET_SYSTEM_QEMU_I486 default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I -- cgit v1.2.3 From 48ff3592bc0f747757544a1719f653cf35f88e27 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Apr 2014 08:03:55 +0200 Subject: fix disk boot --- target/config/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 2bcb4751b..80e37b9cf 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -266,7 +266,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK boolean "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_LINUX_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC -- cgit v1.2.3 From 65d58a1827c68aac8079ab98050f35b17d14b821 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Apr 2014 08:21:57 +0200 Subject: add submenu for qemu configuration --- target/config/Config.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 80e37b9cf..78d15a97e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -216,6 +216,22 @@ config ADK_QEMU_ARGS string default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC +menu "Qemu configuration" +depends on ADK_HARDWARE_QEMU + +choice +prompt "Use a Bootloader" +depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER + boolean "do not use bootloader" + +config ADK_TARGET_QEMU_WITH_BOOTLOADER + boolean "use bootloader" + select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +endchoice + choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL @@ -321,6 +337,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO endchoice +endmenu choice prompt "Use ARM thumb mode" -- cgit v1.2.3