[v2] hw/*/Makefile.objs: Move many .o files to common-objs
diff mbox series

Message ID 20200130133841.10779-1-thuth@redhat.com
State New
Headers show
Series
  • [v2] hw/*/Makefile.objs: Move many .o files to common-objs
Related show

Commit Message

Thomas Huth Jan. 30, 2020, 1:38 p.m. UTC
We have many files that apparently do not depend on the target CPU
configuration, i.e. which can be put into common-obj-y instead of
obj-y. This way, the code can be shared for example between
qemu-system-arm and qemu-system-aarch64, or the various big and
little endian variants like qemu-system-sh4 and qemu-system-sh4eb,
so that we do not have to compile the code multiple times anymore.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: Rebased to master

 hw/adc/Makefile.objs     |  2 +-
 hw/block/Makefile.objs   |  2 +-
 hw/char/Makefile.objs    | 16 ++++++++--------
 hw/core/Makefile.objs    |  2 +-
 hw/display/Makefile.objs |  2 +-
 hw/dma/Makefile.objs     |  6 +++---
 hw/gpio/Makefile.objs    | 10 +++++-----
 hw/i2c/Makefile.objs     |  4 ++--
 hw/i2c/ppc4xx_i2c.c      |  1 -
 hw/input/Makefile.objs   |  8 ++++----
 hw/net/Makefile.objs     |  6 +++---
 hw/nvram/Makefile.objs   |  2 +-
 hw/pcmcia/Makefile.objs  |  2 +-
 hw/sd/Makefile.objs      | 10 +++++-----
 hw/ssi/Makefile.objs     |  4 ++--
 hw/usb/Makefile.objs     |  4 ++--
 16 files changed, 40 insertions(+), 41 deletions(-)

Comments

Alex Bennée Jan. 30, 2020, 2:36 p.m. UTC | #1
Thomas Huth <thuth@redhat.com> writes:

> We have many files that apparently do not depend on the target CPU
> configuration, i.e. which can be put into common-obj-y instead of
> obj-y.

While common-obj-y is still shared by linux-user this will also add
slightly to user-only build times. I'd like to see some separation of:

 common-user-obj
 common-sys-obj

and I guess the stuff already common to everything is already in
libqemuutil.a

> This way, the code can be shared for example between
> qemu-system-arm and qemu-system-aarch64, or the various big and
> little endian variants like qemu-system-sh4 and qemu-system-sh4eb,
> so that we do not have to compile the code multiple times anymore.
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Rebased to master
>
>  hw/adc/Makefile.objs     |  2 +-
>  hw/block/Makefile.objs   |  2 +-
>  hw/char/Makefile.objs    | 16 ++++++++--------
>  hw/core/Makefile.objs    |  2 +-
>  hw/display/Makefile.objs |  2 +-
>  hw/dma/Makefile.objs     |  6 +++---
>  hw/gpio/Makefile.objs    | 10 +++++-----
>  hw/i2c/Makefile.objs     |  4 ++--
>  hw/i2c/ppc4xx_i2c.c      |  1 -
>  hw/input/Makefile.objs   |  8 ++++----
>  hw/net/Makefile.objs     |  6 +++---
>  hw/nvram/Makefile.objs   |  2 +-
>  hw/pcmcia/Makefile.objs  |  2 +-
>  hw/sd/Makefile.objs      | 10 +++++-----
>  hw/ssi/Makefile.objs     |  4 ++--
>  hw/usb/Makefile.objs     |  4 ++--
>  16 files changed, 40 insertions(+), 41 deletions(-)
>
> diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs
> index 3f6dfdedae..2b9dc36c7f 100644
> --- a/hw/adc/Makefile.objs
> +++ b/hw/adc/Makefile.objs
> @@ -1 +1 @@
> -obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
> +common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
> diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
> index 28c2495a00..4b4a2b338d 100644
> --- a/hw/block/Makefile.objs
> +++ b/hw/block/Makefile.objs
> @@ -10,7 +10,7 @@ common-obj-$(CONFIG_ONENAND) += onenand.o
>  common-obj-$(CONFIG_NVME_PCI) += nvme.o
>  common-obj-$(CONFIG_SWIM) += swim.o
>  
> -obj-$(CONFIG_SH4) += tc58128.o
> +common-obj-$(CONFIG_SH4) += tc58128.o
>  
>  obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
>  obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
> diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
> index 02d8a66925..9e9a6c1aff 100644
> --- a/hw/char/Makefile.objs
> +++ b/hw/char/Makefile.objs
> @@ -13,14 +13,13 @@ common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
>  common-obj-$(CONFIG_XEN) += xen_console.o
>  common-obj-$(CONFIG_CADENCE) += cadence_uart.o
>  
> -obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
> -obj-$(CONFIG_COLDFIRE) += mcf_uart.o
> -obj-$(CONFIG_OMAP) += omap_uart.o
> -obj-$(CONFIG_SH4) += sh_serial.o
> -obj-$(CONFIG_PSERIES) += spapr_vty.o
> -obj-$(CONFIG_DIGIC) += digic-uart.o
> -obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
> -obj-$(CONFIG_RASPI) += bcm2835_aux.o
> +common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
> +common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
> +common-obj-$(CONFIG_OMAP) += omap_uart.o
> +common-obj-$(CONFIG_SH4) += sh_serial.o
> +common-obj-$(CONFIG_DIGIC) += digic-uart.o
> +common-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
> +common-obj-$(CONFIG_RASPI) += bcm2835_aux.o
>  
>  common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
>  common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
> @@ -33,4 +32,5 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o
>  common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o
>  
>  obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
> +obj-$(CONFIG_PSERIES) += spapr_vty.o
>  obj-$(CONFIG_TERMINAL3270) += terminal3270.o
> diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
> index a522b7297d..064a8f65e1 100644
> --- a/hw/core/Makefile.objs
> +++ b/hw/core/Makefile.objs
> @@ -18,8 +18,8 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
>  common-obj-$(CONFIG_SOFTMMU) += null-machine.o
>  common-obj-$(CONFIG_SOFTMMU) += loader.o
>  common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
> +common-obj-$(CONFIG_SOFTMMU) += numa.o
>  obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
> -obj-$(CONFIG_SOFTMMU) += numa.o
>  
>  common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
>  common-obj-$(CONFIG_XILINX_AXI) += stream.o
> diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
> index 5f03dfdcc4..77a7d622bd 100644
> --- a/hw/display/Makefile.objs
> +++ b/hw/display/Makefile.objs
> @@ -24,7 +24,7 @@ common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o
>  common-obj-$(CONFIG_BLIZZARD) += blizzard.o
>  common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
>  common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
> -obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
> +common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
>  common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
>  common-obj-$(CONFIG_MACFB) += macfb.o
>  
> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
> index b672e7a522..f4b1cfe26d 100644
> --- a/hw/dma/Makefile.objs
> +++ b/hw/dma/Makefile.objs
> @@ -8,9 +8,9 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
>  common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
>  common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
>  common-obj-$(CONFIG_STP2000) += sparc32_dma.o
> -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
> +common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
>  common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>  
> -obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
> -obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
> +common-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
> +common-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
>  common-obj-$(CONFIG_RASPI) += bcm2835_dma.o
> diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs
> index d305b3b24b..3cfc261f9b 100644
> --- a/hw/gpio/Makefile.objs
> +++ b/hw/gpio/Makefile.objs
> @@ -5,8 +5,8 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o
>  common-obj-$(CONFIG_E500) += mpc8xxx.o
>  common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
>  
> -obj-$(CONFIG_OMAP) += omap_gpio.o
> -obj-$(CONFIG_IMX) += imx_gpio.o
> -obj-$(CONFIG_RASPI) += bcm2835_gpio.o
> -obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
> -obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
> +common-obj-$(CONFIG_OMAP) += omap_gpio.o
> +common-obj-$(CONFIG_IMX) += imx_gpio.o
> +common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
> +common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
> +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
> diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
> index d7073a401f..6ba976b257 100644
> --- a/hw/i2c/Makefile.objs
> +++ b/hw/i2c/Makefile.objs
> @@ -9,5 +9,5 @@ common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
>  common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o
>  common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o
>  common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o
> -obj-$(CONFIG_OMAP) += omap_i2c.o
> -obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
> +common-obj-$(CONFIG_OMAP) += omap_i2c.o
> +common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
> diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
> index 3f015a1581..c0a8e04567 100644
> --- a/hw/i2c/ppc4xx_i2c.c
> +++ b/hw/i2c/ppc4xx_i2c.c
> @@ -27,7 +27,6 @@
>  #include "qemu/osdep.h"
>  #include "qemu/log.h"
>  #include "qemu/module.h"
> -#include "cpu.h"
>  #include "hw/i2c/ppc4xx_i2c.h"
>  #include "hw/irq.h"
>  
> diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
> index f98f635685..abc1ff03c0 100644
> --- a/hw/input/Makefile.objs
> +++ b/hw/input/Makefile.objs
> @@ -12,7 +12,7 @@ common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
>  common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
>  common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
>  
> -obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
> -obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
> -obj-$(CONFIG_TSC210X) += tsc210x.o
> -obj-$(CONFIG_LASIPS2) += lasips2.o
> +common-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
> +common-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
> +common-obj-$(CONFIG_TSC210X) += tsc210x.o
> +common-obj-$(CONFIG_LASIPS2) += lasips2.o
> diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
> index 19f13e9fa5..991c46c773 100644
> --- a/hw/net/Makefile.objs
> +++ b/hw/net/Makefile.objs
> @@ -34,8 +34,8 @@ common-obj-$(CONFIG_SUNHME) += sunhme.o
>  common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
>  common-obj-$(CONFIG_SUNGEM) += sungem.o
>  
> -obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
> -obj-$(CONFIG_COLDFIRE) += mcf_fec.o
> +common-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
> +common-obj-$(CONFIG_COLDFIRE) += mcf_fec.o
>  obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o
>  obj-$(CONFIG_PSERIES) += spapr_llan.o
>  obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
> @@ -45,7 +45,7 @@ common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o
>  common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o
>  common-obj-$(CONFIG_ALL) += vhost_net-stub.o
>  
> -obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
> +common-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
>  			fsl_etsec/rings.o fsl_etsec/miim.o
>  
>  common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \
> diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs
> index 090df63fcd..f3ad921382 100644
> --- a/hw/nvram/Makefile.objs
> +++ b/hw/nvram/Makefile.objs
> @@ -4,5 +4,5 @@ common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
>  common-obj-y += fw_cfg.o
>  common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
>  common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
> +common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
>  obj-$(CONFIG_PSERIES) += spapr_nvram.o
> -obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
> diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs
> index 4eac060c93..02cd986a2c 100644
> --- a/hw/pcmcia/Makefile.objs
> +++ b/hw/pcmcia/Makefile.objs
> @@ -1,2 +1,2 @@
>  common-obj-y += pcmcia.o
> -obj-$(CONFIG_PXA2XX) += pxa2xx.o
> +common-obj-$(CONFIG_PXA2XX) += pxa2xx.o
> diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs
> index a884c238df..e371281ac4 100644
> --- a/hw/sd/Makefile.objs
> +++ b/hw/sd/Makefile.objs
> @@ -4,8 +4,8 @@ common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o
>  common-obj-$(CONFIG_SDHCI) += sdhci.o
>  common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o
>  
> -obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
> -obj-$(CONFIG_OMAP) += omap_mmc.o
> -obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
> -obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
> -obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
> +common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
> +common-obj-$(CONFIG_OMAP) += omap_mmc.o
> +common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
> +common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
> +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
> diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs
> index f5bcc65fe7..07a85f1967 100644
> --- a/hw/ssi/Makefile.objs
> +++ b/hw/ssi/Makefile.objs
> @@ -6,5 +6,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o
>  common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o
>  common-obj-$(CONFIG_MSF2) += mss-spi.o
>  
> -obj-$(CONFIG_OMAP) += omap_spi.o
> -obj-$(CONFIG_IMX) += imx_spi.o
> +common-obj-$(CONFIG_OMAP) += omap_spi.o
> +common-obj-$(CONFIG_IMX) += imx_spi.o
> diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
> index 0052d49ce1..2b10868937 100644
> --- a/hw/usb/Makefile.objs
> +++ b/hw/usb/Makefile.objs
> @@ -13,8 +13,8 @@ common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
>  common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o
>  common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
>  
> -obj-$(CONFIG_TUSB6010) += tusb6010.o
> -obj-$(CONFIG_IMX)      += chipidea.o
> +common-obj-$(CONFIG_TUSB6010) += tusb6010.o
> +common-obj-$(CONFIG_IMX)      += chipidea.o
>  
>  # emulated usb devices
>  common-obj-$(CONFIG_USB) += dev-hub.o
Paolo Bonzini Jan. 30, 2020, 4:33 p.m. UTC | #2
On 30/01/20 15:36, Alex Bennée wrote:
> 
>> We have many files that apparently do not depend on the target CPU
>> configuration, i.e. which can be put into common-obj-y instead of
>> obj-y.
> While common-obj-y is still shared by linux-user this will also add
> slightly to user-only build times.

It won't, all the directories that Thomas is touching are under ifeq
($(CONFIG_SOFTMMU), y)...endif in hw/Makefile.objs.

> I'd like to see some separation of:
> 
>  common-user-obj
>  common-sys-obj

That actually is done in the Meson conversion, where they are called
respectively user_ss and softmmu_ss ("ss" stands for sourceset).  They
are added like so to common_ss:

common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_ss)
common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)

> and I guess the stuff already common to everything is already in
> libqemuutil.a

In my meson-poc branch, the only files that are added directly to
common_ss rather than softmmu_ss or user_ss are the files in hw/core and
the disassemblers.

Paolo

Patch
diff mbox series

diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs
index 3f6dfdedae..2b9dc36c7f 100644
--- a/hw/adc/Makefile.objs
+++ b/hw/adc/Makefile.objs
@@ -1 +1 @@ 
-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
+common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
index 28c2495a00..4b4a2b338d 100644
--- a/hw/block/Makefile.objs
+++ b/hw/block/Makefile.objs
@@ -10,7 +10,7 @@  common-obj-$(CONFIG_ONENAND) += onenand.o
 common-obj-$(CONFIG_NVME_PCI) += nvme.o
 common-obj-$(CONFIG_SWIM) += swim.o
 
-obj-$(CONFIG_SH4) += tc58128.o
+common-obj-$(CONFIG_SH4) += tc58128.o
 
 obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
 obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index 02d8a66925..9e9a6c1aff 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -13,14 +13,13 @@  common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
 common-obj-$(CONFIG_XEN) += xen_console.o
 common-obj-$(CONFIG_CADENCE) += cadence_uart.o
 
-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
-obj-$(CONFIG_OMAP) += omap_uart.o
-obj-$(CONFIG_SH4) += sh_serial.o
-obj-$(CONFIG_PSERIES) += spapr_vty.o
-obj-$(CONFIG_DIGIC) += digic-uart.o
-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
-obj-$(CONFIG_RASPI) += bcm2835_aux.o
+common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
+common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
+common-obj-$(CONFIG_OMAP) += omap_uart.o
+common-obj-$(CONFIG_SH4) += sh_serial.o
+common-obj-$(CONFIG_DIGIC) += digic-uart.o
+common-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
+common-obj-$(CONFIG_RASPI) += bcm2835_aux.o
 
 common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
 common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
@@ -33,4 +32,5 @@  common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o
 common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o
 
 obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
+obj-$(CONFIG_PSERIES) += spapr_vty.o
 obj-$(CONFIG_TERMINAL3270) += terminal3270.o
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index a522b7297d..064a8f65e1 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -18,8 +18,8 @@  common-obj-$(CONFIG_SOFTMMU) += machine.o
 common-obj-$(CONFIG_SOFTMMU) += null-machine.o
 common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
+common-obj-$(CONFIG_SOFTMMU) += numa.o
 obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
-obj-$(CONFIG_SOFTMMU) += numa.o
 
 common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
 common-obj-$(CONFIG_XILINX_AXI) += stream.o
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 5f03dfdcc4..77a7d622bd 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -24,7 +24,7 @@  common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o
 common-obj-$(CONFIG_BLIZZARD) += blizzard.o
 common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
 common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
+common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
 common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
 common-obj-$(CONFIG_MACFB) += macfb.o
 
diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
index b672e7a522..f4b1cfe26d 100644
--- a/hw/dma/Makefile.objs
+++ b/hw/dma/Makefile.objs
@@ -8,9 +8,9 @@  common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
 common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
 common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
 common-obj-$(CONFIG_STP2000) += sparc32_dma.o
-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
+common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
 common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
 
-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
+common-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
+common-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
 common-obj-$(CONFIG_RASPI) += bcm2835_dma.o
diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs
index d305b3b24b..3cfc261f9b 100644
--- a/hw/gpio/Makefile.objs
+++ b/hw/gpio/Makefile.objs
@@ -5,8 +5,8 @@  common-obj-$(CONFIG_ZAURUS) += zaurus.o
 common-obj-$(CONFIG_E500) += mpc8xxx.o
 common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
 
-obj-$(CONFIG_OMAP) += omap_gpio.o
-obj-$(CONFIG_IMX) += imx_gpio.o
-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
+common-obj-$(CONFIG_OMAP) += omap_gpio.o
+common-obj-$(CONFIG_IMX) += imx_gpio.o
+common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
+common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
+common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
index d7073a401f..6ba976b257 100644
--- a/hw/i2c/Makefile.objs
+++ b/hw/i2c/Makefile.objs
@@ -9,5 +9,5 @@  common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
 common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o
 common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o
 common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o
-obj-$(CONFIG_OMAP) += omap_i2c.o
-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
+common-obj-$(CONFIG_OMAP) += omap_i2c.o
+common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index 3f015a1581..c0a8e04567 100644
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -27,7 +27,6 @@ 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "cpu.h"
 #include "hw/i2c/ppc4xx_i2c.h"
 #include "hw/irq.h"
 
diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
index f98f635685..abc1ff03c0 100644
--- a/hw/input/Makefile.objs
+++ b/hw/input/Makefile.objs
@@ -12,7 +12,7 @@  common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
 common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
 common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
 
-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
-obj-$(CONFIG_TSC210X) += tsc210x.o
-obj-$(CONFIG_LASIPS2) += lasips2.o
+common-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
+common-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
+common-obj-$(CONFIG_TSC210X) += tsc210x.o
+common-obj-$(CONFIG_LASIPS2) += lasips2.o
diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
index 19f13e9fa5..991c46c773 100644
--- a/hw/net/Makefile.objs
+++ b/hw/net/Makefile.objs
@@ -34,8 +34,8 @@  common-obj-$(CONFIG_SUNHME) += sunhme.o
 common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 common-obj-$(CONFIG_SUNGEM) += sungem.o
 
-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
-obj-$(CONFIG_COLDFIRE) += mcf_fec.o
+common-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
+common-obj-$(CONFIG_COLDFIRE) += mcf_fec.o
 obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o
 obj-$(CONFIG_PSERIES) += spapr_llan.o
 obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
@@ -45,7 +45,7 @@  common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o
 common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o
 common-obj-$(CONFIG_ALL) += vhost_net-stub.o
 
-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
+common-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
 			fsl_etsec/rings.o fsl_etsec/miim.o
 
 common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \
diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs
index 090df63fcd..f3ad921382 100644
--- a/hw/nvram/Makefile.objs
+++ b/hw/nvram/Makefile.objs
@@ -4,5 +4,5 @@  common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
 common-obj-y += fw_cfg.o
 common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
 common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
+common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
 obj-$(CONFIG_PSERIES) += spapr_nvram.o
-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs
index 4eac060c93..02cd986a2c 100644
--- a/hw/pcmcia/Makefile.objs
+++ b/hw/pcmcia/Makefile.objs
@@ -1,2 +1,2 @@ 
 common-obj-y += pcmcia.o
-obj-$(CONFIG_PXA2XX) += pxa2xx.o
+common-obj-$(CONFIG_PXA2XX) += pxa2xx.o
diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs
index a884c238df..e371281ac4 100644
--- a/hw/sd/Makefile.objs
+++ b/hw/sd/Makefile.objs
@@ -4,8 +4,8 @@  common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o
 common-obj-$(CONFIG_SDHCI) += sdhci.o
 common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o
 
-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
-obj-$(CONFIG_OMAP) += omap_mmc.o
-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
+common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
+common-obj-$(CONFIG_OMAP) += omap_mmc.o
+common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
+common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
+common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs
index f5bcc65fe7..07a85f1967 100644
--- a/hw/ssi/Makefile.objs
+++ b/hw/ssi/Makefile.objs
@@ -6,5 +6,5 @@  common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o
 common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o
 common-obj-$(CONFIG_MSF2) += mss-spi.o
 
-obj-$(CONFIG_OMAP) += omap_spi.o
-obj-$(CONFIG_IMX) += imx_spi.o
+common-obj-$(CONFIG_OMAP) += omap_spi.o
+common-obj-$(CONFIG_IMX) += imx_spi.o
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 0052d49ce1..2b10868937 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -13,8 +13,8 @@  common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
 common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o
 common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
 
-obj-$(CONFIG_TUSB6010) += tusb6010.o
-obj-$(CONFIG_IMX)      += chipidea.o
+common-obj-$(CONFIG_TUSB6010) += tusb6010.o
+common-obj-$(CONFIG_IMX)      += chipidea.o
 
 # emulated usb devices
 common-obj-$(CONFIG_USB) += dev-hub.o