From patchwork Mon Dec 3 22:08:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 203470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5936B2C0098 for ; Tue, 4 Dec 2012 09:47:34 +1100 (EST) Received: from localhost ([::1]:48710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeJV-0000Et-9H for incoming@patchwork.ozlabs.org; Mon, 03 Dec 2012 17:16:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIX-000737-F1 for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfeIW-00032R-7N for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:33 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:49594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIU-0002mU-4K; Mon, 03 Dec 2012 17:15:30 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so2526528iac.4 for ; Mon, 03 Dec 2012 14:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=g5R+lQd64ZzvUyZMMlqJpfNAt4jaSMmcJVO4ySmrOoY=; b=kvFdxtn8kNxC7BI26J4Zda6tkG4twXToWax8SjjVEYVE0wM4GMJZdYzZj7JvGvAP74 7KTD3WSP2H57zTcXkkV5qCzNVTJTvuCp8n8kHs4x8PltU9tyPwVnsgFItSmEMAMlwlt5 hAJyObB4c8OQrTCls7N43diYAaAmrp3B29y5t7Mk8fYSIRPZUcNiWYyVdMEBAmebSL9M xHEwgEO2YiYmFYftGQeiY1VaXEzd7xHq4+OltszbaARGJYC5dhj7oHeqmi3cH5RHUPfv epi571XZg5KA0DnK7diQtzgYNboUj3phP9+CrM3bxyrAUWM69EFY1o6w55eqEJ4+OBvb z9nQ== Received: by 10.42.81.18 with SMTP id x18mr9215813ick.1.1354572929932; Mon, 03 Dec 2012 14:15:29 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id 10sm8173649ign.5.2012.12.03.14.15.28 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:15:29 -0800 (PST) From: Michael Roth To: qemu-stable@nongnu.org Date: Mon, 3 Dec 2012 16:08:39 -0600 Message-Id: <1354572547-21271-16-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 15/43] target-sparc64: disable VGA cirrus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Aurelien Jarno OpenBIOS on sparc64 only support Standard VGA and not Cirrus VGA. Don't build Cirrus VGA support so that it can't be selected. This fixes the breakage introduced by commit f2898771. Reported-by: Richard Henderson Cc: Blue Swirl Signed-off-by: Aurelien Jarno Tested-by: Richard Henderson Signed-off-by: Blue Swirl (cherry picked from commit 0356404b0f1da939657cad1efeb556745cd430d5) Signed-off-by: Michael Roth --- default-configs/sparc64-softmmu.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index c9a36c1..03e8b42 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_VGA=y CONFIG_VGA_PCI=y -CONFIG_VGA_CIRRUS=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_PCKBD=y