[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/35] hw: move NVRAM interfaces to hw/nvram/, confi
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 31/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/ |
Date: |
Mon, 18 Mar 2013 18:35:21 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 27/35] hw: move VFIO and ivshmem to hw/pci/, (continued)
- [Qemu-devel] [PATCH 27/35] hw: move VFIO and ivshmem to hw/pci/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 30/35] hw: move GPIO interfaces to hw/gpio/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 32/35] hw: move other devices to hw/misc/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 35/35] hw: move private headers to hw/ subdirectories., Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 33/35] arm: move remaining files to hw/arm/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 26/35] hw: move PCI bridges to hw/pci/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 25/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 10/35] hw: make all of hw/pci/ configurable via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 23/35] hw: move timer devices to hw/timer/, configure with default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 11/35] hw: move watchdogs to hw/watchdog, configure via default-configs/, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 31/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 34/35] MAINTAINERS: update for source code movement, Paolo Bonzini, 2013/03/18
- [Qemu-devel] [PATCH 06/35] hw: move target-independent files to subdirectories, Paolo Bonzini, 2013/03/18