From patchwork Sat May 3 20:20:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 345359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id D9ACA140147 for ; Sun, 4 May 2014 06:21:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2679E935DF; Sat, 3 May 2014 20:21:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xbt8fdPVQ300; Sat, 3 May 2014 20:21:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5608088ADB; Sat, 3 May 2014 20:21:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B42521BF966 for ; Sat, 3 May 2014 20:21:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B02C88AE29 for ; Sat, 3 May 2014 20:21:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DXufxKsox0Nd for ; Sat, 3 May 2014 20:21:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id BBD958AFB8 for ; Sat, 3 May 2014 20:21:45 +0000 (UTC) Received: from asgard (host14.181-1-250.telecom.net.ar [181.1.250.14]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.8/8.14.8) with ESMTP id s43KLcas005337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 3 May 2014 20:21:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1399148503; bh=lBz5M00zI7p6sQKMIgTYznDNJ6/RbzTcE8hBmVcOhBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oBkSSqC5/P1AMz2mAnr8ipQA9LtX2eRyo1Obc4mEYt4D3wktVMmRssDsUJ/nfFo0T ajomuVSdWKyfk+AlN1oSkaYXJgFbUJa+Fnt5HyTuimWs2saVj6ajtM4IrHGNiAdDzm yzzwnM3Hbpvj8Pplwpcj06VyvYA6tnxeGPomAxAU= Received: by asgard (sSMTP sendmail emulation); Sat, 03 May 2014 17:20:27 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sat, 3 May 2014 17:20:14 -0300 Message-Id: <1399148415-27648-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399148415-27648-1-git-send-email-gustavo@zacarias.com.ar> References: <1399148415-27648-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.98.1 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/3] configs/qemu: update for host-qemu-system X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Add the invocation parameter for use with host-qemu-system. Narrow down the Qemu version like it's done for kernel headers since we can't guarantee that a host-qemu-system version bump won't break the configs. Signed-off-by: Gustavo Zacarias --- configs/qemu_arm_nuri_defconfig | 5 +++++ configs/qemu_arm_versatile_defconfig | 5 +++++ configs/qemu_arm_vexpress_defconfig | 5 +++++ configs/qemu_microblazebe_mmu_defconfig | 5 +++++ configs/qemu_microblazeel_mmu_defconfig | 5 +++++ configs/qemu_mips64_malta_defconfig | 5 +++++ configs/qemu_mips64el_malta_defconfig | 5 +++++ configs/qemu_mips_malta_defconfig | 5 +++++ configs/qemu_mipsel_malta_defconfig | 5 +++++ configs/qemu_ppc_g3beige_defconfig | 5 +++++ configs/qemu_ppc_mpc8544ds_defconfig | 5 +++++ configs/qemu_ppc_virtex_ml507_defconfig | 5 +++++ configs/qemu_sh4_r2d_defconfig | 5 +++++ configs/qemu_sparc_ss10_defconfig | 5 +++++ configs/qemu_x86_64_defconfig | 5 +++++ configs/qemu_x86_defconfig | 5 +++++ 16 files changed, 80 insertions(+) diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index 40dcb37..0222459 100644 --- a/configs/qemu_arm_nuri_defconfig +++ b/configs/qemu_arm_nuri_defconfig @@ -25,3 +25,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.32" BR2_LINUX_KERNEL_DEFCONFIG="exynos4" BR2_LINUX_KERNEL_ZIMAGE=y + +# Qemu-system +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M nuri -kernel output/images/zImage -append 'console=ttySAC1,115200' -smp 2 -serial null -serial stdio -display curses" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 1348bab..0accccd 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.13.config" BR2_LINUX_KERNEL_ZIMAGE=y + +# Qemu-system +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append 'root=/dev/sda console=ttyAMA0,115200' -serial stdio -net nic,model=smc91c111 -net user -display none" diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index e35a44a..facb3f6 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -24,3 +24,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_ZIMAGE=y + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M vexpress-a9 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=sd -append 'console=ttyAMA0,115200 root=/dev/mmcblk0' -serial stdio -net nic,model=lan9118 -net user -display none" diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index b3ec32f..0698178 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -17,3 +17,8 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.14.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio -display none" diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index a009893..a0383e5 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -17,3 +17,8 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.14.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio -display none" diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 97937d1..6759a0d 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append 'root=/dev/hda' -display none" diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 4adf204..e3497de 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -25,3 +25,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append 'root=/dev/hda' -display none" diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 3c1532c..b788312 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append 'root=/dev/hda' -net nic,model=pcnet -net user -display none" diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index b673f0b..8642de8 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_malta_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append 'root=/dev/hda' -net nic,model=pcnet -net user -display none" diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 1668e72..ef2cf49 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append 'console=ttyS0 root=/dev/hda' -serial stdio -net nic,model=rtl8139 -net user -display none" diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 6d7f24d..18b7862 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -21,3 +21,8 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user -display none" diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index cd2f647..f5f1d04 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -22,3 +22,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M virtex-ml507 -kernel output/images/vmlinux -m 256 -append 'console=ttyS0' -display none -nographic -dtb output/images/virtex440-ml507.dtb" diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index b27d9ec..fd70d69 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -26,3 +26,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.55" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config" BR2_LINUX_KERNEL_ZIMAGE=y + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append 'root=/dev/sda console=ttySC1,115200 noiotrap' -serial null -serial stdio -net nic,model=rtl8139 -net user -display none" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 3b56d98..15893bd 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -17,3 +17,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.5" BR2_LINUX_KERNEL_DEFCONFIG="sparc32" BR2_LINUX_KERNEL_ZIMAGE=y + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append 'root=/dev/sda console=ttyS0,115200' -serial stdio -net nic,model=lance -net user -display none" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 827d362..95e6a00 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -20,3 +20,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.13.config" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append 'root=/dev/sda' -net nic,model=rtl8139 -net user -display curses" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index a5040c8..3fa1432 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -21,3 +21,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.13.config" + +# Qemu +BR2_PACKAGE_HOST_QEMU_SYSTEM=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_VERSION="2.0.0" +BR2_PACKAGE_HOST_QEMU_SYSTEM_ARGS="-M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append 'root=/dev/sda' -net nic,model=rtl8139 -net user -display curses"