From patchwork Tue Oct 30 11:23:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 990749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42kq4D6dCJz9s7W for ; Tue, 30 Oct 2018 22:29:16 +1100 (AEDT) Received: from localhost ([::1]:52258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHSCw-0006BL-A9 for incoming@patchwork.ozlabs.org; Tue, 30 Oct 2018 07:29:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHS8g-0001b6-LP for qemu-devel@nongnu.org; Tue, 30 Oct 2018 07:24:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHS8f-0002cp-3F for qemu-devel@nongnu.org; Tue, 30 Oct 2018 07:24:50 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:53357) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHS8e-0002Y3-Lh; Tue, 30 Oct 2018 07:24:48 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5wgF-1gBeJH20Xj-007XYf; Tue, 30 Oct 2018 12:24:24 +0100 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5wgF-1gBeJH20Xj-007XYf; Tue, 30 Oct 2018 12:24:24 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 12:23:36 +0100 Message-Id: <20181030112337.17973-20-laurent@vivier.eu> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181030112337.17973-1-laurent@vivier.eu> References: <20181030112337.17973-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Onxu/4XDh0jaT2PjMMZ+DvHlJo5HYaBM3GOMvdxKAvezyiybZ4/ +wBQgSHXjv9ia+tJuI9ezUmg2W7KXx3ekOySgDSHgV/JajGwABC9/HRq2jO/MBf08Lr4h4/ hV1O3ULqiwllm49AcUbvDZJOM9Du49YN8PhQCdk1FEF3V2psI8EhxX1LNrKITzQ3c4F4ufp QiCrKnsLmPc+5mJDmIbvw== X-UI-Out-Filterresults: notjunk:1; V01:K0:IBrtWAJUG3Q=:48MbjHQVjHgFfr+mUIdERq DbrYiHzyjdS2+pk0cHQxqT6IpblKYxCdeznEPdT8LaZutoiTIa8N1Pe8KAGqhukBzGYkjKsIw yHIAzJkPvELvEmU5SoWhtgtNhiOUPbC41r/r2NZ7HoZ0yYJgtLAzE40S9szAhaXTz4Kg1L60I 1pHcaKd5wkutSo3idcx82Bs6z0Pkr7l//IGpWYzdeWd5GK9pQlGzZ7Xxe64TgywIjH08HxxF1 djaZqniHhjzd1Or3u6w0nlJUQpxqhp1oW0YOxlO9l19fHGURCsgoerWDF2kvjPl2oCV7zxmuX G46Ie0uPrfDVXCIdBfTFoH0+3DMPENw5ICaPSlZ7XJrlMWGC7P06An52sSAoXgW4AVo7aoW1j wBHrwcJvqb8VW1bUrxOOrv8JtVHETg7N128QmamS79eqZuX4sLfimlXDG5wxLSapt7/c1VSDp GicZlsDDc4I1Dmcx6sxvzN/MB+pv7An3JbjEoboLFVZxaZC7K9fhgGLKBM270lepNqj9CZ7dt n8g5L15nh4xirzqp88vif7a9IBvR5hfti/VKWYZxCHShl9wdBNaa2YOY6l9stbcvaG6jWWkRT bocLUfLAOh8nTUaiPGnG5pjGRbFBtaIDbMtLs1ocdowapZme4xDYSGgdRfbCzDuxL41KGjXzo 6eCHNit5O8NG20I69LtUdCaq4Ej1QWbm7QfAaPS2Bd4PhRsbOYrC+fTcw4TdLKOMtGUuruMn6 seAvkdKV7Rrh6O9I X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL v2 19/20] ppc: move at24c to its own CONFIG_ symbol X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Jason Wang , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Michael Walle , Anthony Perard , xen-devel@lists.xenproject.org, Laurent Vivier , Thomas Huth , Fam Zheng , Eduardo Habkost , Riku Voipio , qemu-arm@nongnu.org, Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= , Kevin Wolf , Markus Armbruster , Laurent Vivier , Max Reitz , Igor Mammedov , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini AT24c EEPROM is currently gated by CONFIG_I2C, and as such it is being included in all emulators that use I2C, even if they do not really need it. Separate it and, since it was added for the e500 machines, add it to qemu-system-ppc and qemu-system-ppc64. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20180522191743.12872-1-pbonzini@redhat.com> [lv: rebase] Signed-off-by: Laurent Vivier --- default-configs/ppc-softmmu.mak | 1 + hw/nvram/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 3181bbf163..23d871fb3e 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -28,6 +28,7 @@ CONFIG_SM501=y CONFIG_DDC=y CONFIG_IDE_SII3112=y CONFIG_I2C=y +CONFIG_AT24C=y CONFIG_BITBANG_I2C=y CONFIG_M41T80=y CONFIG_VGA_CIRRUS=y diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index a912d25391..b318e53a43 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -1,6 +1,6 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o common-obj-y += eeprom93xx.o -common-obj-$(CONFIG_I2C) += eeprom_at24c.o +common-obj-$(CONFIG_AT24C) += eeprom_at24c.o common-obj-y += fw_cfg.o common-obj-y += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o