Patchwork [29/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/

login
register
mail settings
Submitter Paolo Bonzini
Date April 4, 2013, 7:23 p.m.
Message ID <1365103395-11547-30-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/233924/
State New
Headers show

Comments

Paolo Bonzini - April 4, 2013, 7:23 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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%)

Patch

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)