From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeDn-000148-0g for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHeDl-0000OV-4Q for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:42 -0400 Received: from mail-bk0-x236.google.com ([2a00:1450:4008:c01::236]:54440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyy-00029m-A2 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:24 -0400 Received: by mail-bk0-f54.google.com with SMTP id w5so2694795bku.27 for ; Mon, 18 Mar 2013 10:36:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:21 +0100 Message-Id: <1363628125-5310-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 31/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 dd2bd08..fd0a660 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) -- 1.8.1.4