From patchwork Wed Mar 21 22:05:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 148093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id D2CFAB6FDF for ; Thu, 22 Mar 2012 09:33:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DBB048D192; Wed, 21 Mar 2012 22:33:40 +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 stLb2D7wJVcg; Wed, 21 Mar 2012 22:33:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 718218D431; Wed, 21 Mar 2012 22:33:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D186C8F790 for ; Wed, 21 Mar 2012 22:31:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C9E361001A0 for ; Wed, 21 Mar 2012 22:31:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WMRi6acF4THJ for ; Wed, 21 Mar 2012 22:31:26 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0E9B1100DC9 for ; Wed, 21 Mar 2012 22:31:26 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 0A3EA96928; Wed, 21 Mar 2012 22:31:26 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Wed, 21 Mar 2012 23:05:59 +0100 X-Git-Refname: refs/heads/master X-Git-Oldrev: 7815993d8a9745695d638e34509c97a708a84d5d X-Git-Newrev: 1775ca03a09c96613c7740c9954d33c420231031 Message-Id: <20120321223126.0A3EA96928@busybox.osuosl.org> Subject: [Buildroot] [git commit] qemu/x86: update to use kernel 3.3 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 commit: http://git.buildroot.net/buildroot/commit/?id=1775ca03a09c96613c7740c9954d33c420231031 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also switch documentation to use qemu-system-i386 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../x86/{linux-3.2.config => linux-3.3.config} | 0 board/qemu/x86/readme.txt | 2 +- configs/qemu_x86_defconfig | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/x86/linux-3.2.config b/board/qemu/x86/linux-3.3.config similarity index 100% rename from board/qemu/x86/linux-3.2.config rename to board/qemu/x86/linux-3.3.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index c06d24f..4ba6607 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda The login prompt will appear in the graphical window. diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index d20850a..5d0e23b 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"