From patchwork Fri Oct 26 15:31:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 989649 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 42hTRJ0Nl2z9sDr for ; Sat, 27 Oct 2018 03:07:40 +1100 (AEDT) Received: from localhost ([::1]:60865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG4e9-0003XW-Ad for incoming@patchwork.ozlabs.org; Fri, 26 Oct 2018 12:07:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gG4J9-0003mJ-IL for qemu-devel@nongnu.org; Fri, 26 Oct 2018 11:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gG46t-0005QY-TC for qemu-devel@nongnu.org; Fri, 26 Oct 2018 11:33:20 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:45359) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gG46b-0004wW-LK; Fri, 26 Oct 2018 11:32:57 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mv3M8-1fPTTZ0ozo-00r0dP; Fri, 26 Oct 2018 17:32:21 +0200 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mv3M8-1fPTTZ0ozo-00r0dP; Fri, 26 Oct 2018 17:32:21 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2018 17:31:25 +0200 Message-Id: <20181026153125.24738-21-laurent@vivier.eu> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181026153125.24738-1-laurent@vivier.eu> References: <20181026153125.24738-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:KclRKIrIPGBTOGMjoqcysLNDM8QxCF5ssfwQakHXJ9Nqg9/6fxz /1aniyI3DJXYydjEE1QS3TSzttpEMiuvyJFGSFkv/63u3VFFF417jlGodsTsOHP7fqZ6dke 5EV9QB95RAdcFyvGs4QkymIceWgtU1iyqM2pX6UcyLxikvjo1Imv7atLScwLaSktlS1rQr3 ldOWvFO7er8LMfVe1x/LA== X-UI-Out-Filterresults: notjunk:1; V01:K0:2s2VV2pj5yM=:HjZv4m41rAcvloX/Ghjz63 m+hNHTf6s7a1a7XQtxkbpnbfVXbli5kTCxigU+CU0YBvVfVbgduFIZeZn4iKDgmaqOqNkm8bX FA/dVNYyQyFxWz0XKEMprHHg68T+RCkw/CdeNRHjbUWfhIsjE2dEuHdC9J/6RNh5sxJAGle/3 I+xV5YTmQVz1Ws9Ii6ybl7B0n6HJtSayg+rc5dQB5E1uum2o+syGCfYBcYP9SYWW9kJytwxcA KbtacHALrDYQ0XMARTGSWxR283QCcbAY0DJeIRht2zqrwB+WTY+Y+DoTrMIkKic3qvTK6I2cS Ze84KA70qyGeWshHl5rBusNyw5mBXDh4ZGPODlAswUQkrNgzMSHR8T1cDxFmW7DHSizRUNXo7 1wUpnqmSIL1zpbQsDdtgf65svyynic2j2Cq8cfO1kZavOprfQ5/oEMPPWv1U3R/4h4Xeyd3jX ncLLBmwYJc9BU9GsUOBlQLTgER7RM7BS5XQBjIEAhQxRNh0rxMxopOQpKx8SqbBpdsolUxF0Y nHfv2fLogDSSwJ+OSPjrmWFjoICJP1cdowZ+oSTN/lJUnni/XNqqn9p5W0GmJiUyjrXUiuKFE 59AoqcoHp0JXFvEoQZA2Kqc+SmpRm0a5GUYMHIZ+OCBfLv7X4lqSPcdzbRFml0r84P7wkXnE5 uG6MXLtT8uFM1BJR5BReguM2/SL0IFidTx/G+HhD7p5VayEIHnppMI86j1P49oEX3SfC+F7lb UDbN1MpfG58zcPo/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 20/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, Markus Armbruster , Anthony Perard , xen-devel@lists.xenproject.org, Igor Mammedov , 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 , Laurent Vivier , Max Reitz , Michael Walle , 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