From patchwork Mon Nov 3 18:36:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 406327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1E943140082 for ; Tue, 4 Nov 2014 05:37:01 +1100 (AEDT) Received: from localhost ([::1]:36744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlMUt-00011T-1q for incoming@patchwork.ozlabs.org; Mon, 03 Nov 2014 13:36:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlMUT-0000aT-Eq for qemu-devel@nongnu.org; Mon, 03 Nov 2014 13:36:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlMUM-0005JE-F9 for qemu-devel@nongnu.org; Mon, 03 Nov 2014 13:36:33 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:48761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlMUM-0005Hw-9s for qemu-devel@nongnu.org; Mon, 03 Nov 2014 13:36:26 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XlMUI-00032V-QG from Maciej_Rozycki@mentor.com ; Mon, 03 Nov 2014 10:36:23 -0800 Received: from localhost (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 3 Nov 2014 18:36:21 +0000 Date: Mon, 3 Nov 2014 18:36:17 +0000 From: "Maciej W. Rozycki" To: Message-ID: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Cc: Leon Alrae , Aurelien Jarno Subject: [Qemu-devel] [PATCH] mips: Remove CONFIG_VT82C686 from non-Fulong configs 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 Fix the regression introduced with commit 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa [hw: move ISA bridges and devices to hw/isa/, configure with default-configs/], by removing CONFIG_VT82C686 from configurations that previously did not enable it. That southbridge is only available on Fulong platforms (CONFIG_FULONG) that are exclusively little-endian, 64-bit MIPS. Previously vt82c686.o was pulled explicitly with obj-$(CONFIG_FULONG). Signed-off-by: Maciej W. Rozycki Reviewed-by: Leon Alrae --- Hi, Trivial stuff first, tougher later on. Compile-tested only, this addresses a regression and should be obviously correct. Please apply. Thanks, Maciej qemu-mipseb-fulong-vt82c686.diff Index: qemu-git-trunk/default-configs/mips-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mips-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mips-softmmu.mak 2014-10-28 23:01:51.178971390 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y Index: qemu-git-trunk/default-configs/mips64-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mips64-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mips64-softmmu.mak 2014-10-28 23:02:09.678926473 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y Index: qemu-git-trunk/default-configs/mipsel-softmmu.mak =================================================================== --- qemu-git-trunk.orig/default-configs/mipsel-softmmu.mak 2014-03-01 02:45:51.000000000 +0000 +++ qemu-git-trunk/default-configs/mipsel-softmmu.mak 2014-10-28 23:02:26.677701438 +0000 @@ -32,6 +32,5 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y -CONFIG_VT82C686=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y