diff options
| author | Paolo Bonzini | 2013-02-05 16:36:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2013-04-08 18:13:16 +0200 |
| commit | 5193899a5a7de923c77cbc4e5019e5009294245e (patch) | |
| tree | c0103584510818594f5d1896313079ab9fb6a8d3 | |
| parent | hw: move interrupt controllers to hw/intc/, configure with default-configs/ (diff) | |
| download | qemu-5193899a5a7de923c77cbc4e5019e5009294245e.tar.gz qemu-5193899a5a7de923c77cbc4e5019e5009294245e.tar.xz qemu-5193899a5a7de923c77cbc4e5019e5009294245e.zip | |
hw: move GPIO interfaces to hw/gpio/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/arm/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/gpio/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/gpio/omap_gpio.c (renamed from hw/omap_gpio.c) | 0 | ||||
| -rw-r--r-- | hw/gpio/zaurus.c (renamed from hw/zaurus.c) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 915073bd2c..ec4d0cb7d5 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -4,8 +4,7 @@ obj-y += arm_sysctl.o arm11mpcore.o a9mpcore.o obj-y += exynos4210_pmu.o obj-y += a15mpcore.o obj-y += pxa2xx_pcmcia.o -obj-y += zaurus.o -obj-y += omap_clk.o omap_gpio.o +obj-y += omap_clk.o obj-y += omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o obj-y += cbus.o obj-y += mst_fpga.o diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs index f8d8ee87f9..2c8b51f09a 100644 --- a/hw/gpio/Makefile.objs +++ b/hw/gpio/Makefile.objs @@ -1,3 +1,6 @@ common-obj-$(CONFIG_MAX7310) += max7310.o common-obj-$(CONFIG_PL061) += pl061.o common-obj-$(CONFIG_PUV3) += puv3_gpio.o +common-obj-$(CONFIG_ZAURUS) += zaurus.o + +obj-$(CONFIG_OMAP) += omap_gpio.o diff --git a/hw/omap_gpio.c b/hw/gpio/omap_gpio.c index f5eeaea549..f5eeaea549 100644 --- a/hw/omap_gpio.c +++ b/hw/gpio/omap_gpio.c diff --git a/hw/zaurus.c b/hw/gpio/zaurus.c index d853ea1310..d853ea1310 100644 --- a/hw/zaurus.c +++ b/hw/gpio/zaurus.c |