From patchwork Thu Apr 4 19:23:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233924 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 822ED2C00AB for ; Fri, 5 Apr 2013 06:37:18 +1100 (EST) Received: from localhost ([::1]:45487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpyG-0003m7-Ow for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:37:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpln-0002Iz-UQ for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplm-0002AS-Cb for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:23 -0400 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:35471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpll-00027w-Uo for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:22 -0400 Received: by mail-we0-f174.google.com with SMTP id u12so2326048wey.19 for ; Thu, 04 Apr 2013 12:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=uOGr1bfTg9bvW4umjgzYBDhCKi2Utcog7FDpkgyjiEo=; b=oYMvYIlCNQ5q+hHDHMqZVHzUEuHQR2qlwx0Ou0LRS2Vhgo5f4cLmsb48xZ3BhBWkEI E+bslxmBLvM/GU75s10Z2JkRF9IGUEZyRNUFDax5JT8qpEH31e0aU06lhSn1pkDZU4WB siqYm/fkH49w1QedPluRPTVTB5PAimVudLsWBEXE/O+1C2YkvIbCraKIHypuvs7ThNzp O6qZGzCb0OiR6Pz2MWHOL9txpQr30BxM3ClYTmbQR72jdAIHNFAt1lu2rBzL8qTgD3zo t1VCmnkiO3mfVll7d7ip1L1u4zQh2Sk2msjWXtdM1+jfnRxubk69ucSF5+QKsgmlDM0C B/zw== X-Received: by 10.194.119.200 with SMTP id kw8mr11612030wjb.31.1365103461177; Thu, 04 Apr 2013 12:24:21 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.24.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:24:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:23:09 +0200 Message-Id: <1365103395-11547-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22e Subject: [Qemu-devel] [PATCH 29/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-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 Signed-off-by: Paolo Bonzini --- hw/nvram/Makefile.objs | 1 + hw/{ => nvram}/spapr_nvram.c | 0 hw/ppc/Makefile.objs | 5 ----- 3 files changed, 1 insertion(+), 5 deletions(-) rename hw/{ => nvram}/spapr_nvram.c (100%) diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 80fb1b0..e9a6694 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -2,3 +2,4 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o common-obj-y += eeprom93xx.o common-obj-y += fw_cfg.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o +obj-$(CONFIG_PSERIES) += spapr_nvram.o diff --git a/hw/spapr_nvram.c b/hw/nvram/spapr_nvram.c similarity index 100% rename from hw/spapr_nvram.c rename to hw/nvram/spapr_nvram.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 280ed26..be00d1d 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,8 +1,3 @@ -# IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr_nvram.o - -obj-y := $(addprefix ../,$(obj-y)) - # shared objects obj-y += ppc.o ppc_booke.o # IBM pSeries (sPAPR)