diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 16:36:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:16 +0200 |
| commit | 914e29d28052dbe5a4f41b71eaf8c7bb19ac0929 (patch) | |
| tree | d1cc5e20d30ce918218894c0c022d21dd0b53d22 /hw | |
| parent | 5193899a5a7de923c77cbc4e5019e5009294245e (diff) | |
| download | qemu-914e29d28052dbe5a4f41b71eaf8c7bb19ac0929.zip | |
hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/nvram/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/nvram/spapr_nvram.c (renamed from hw/spapr_nvram.c) | 0 | ||||
| -rw-r--r-- | hw/ppc/Makefile.objs | 5 |
3 files changed, 1 insertions, 5 deletions
diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 80fb1b0441..e9a66940e0 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 index 0cc6cba0e3..0cc6cba0e3 100644 --- a/hw/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 280ed266e0..be00d1da3b 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) |