Skip to content

Commit

Permalink
hw: move I2C controllers to hw/i2c/, configure via default-configs/
Browse files Browse the repository at this point in the history
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Apr 8, 2013
1 parent fc97bb5 commit 53ed424
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions default-configs/arm-softmmu.mak
Expand Up @@ -50,6 +50,7 @@ CONFIG_CADENCE=y
CONFIG_XGMAC=y
CONFIG_EXYNOS4=y
CONFIG_PXA2XX=y
CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
Expand Down
5 changes: 2 additions & 3 deletions hw/arm/Makefile.objs
Expand Up @@ -6,20 +6,19 @@ obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y += exynos4210_gic.o exynos4210_combiner.o
obj-y += exynos4210_uart.o exynos4210_pwm.o
obj-y += exynos4210_pmu.o exynos4210_mct.o
obj-y += exynos4210_rtc.o exynos4210_i2c.o
obj-y += exynos4210_rtc.o
obj-y += arm_mptimer.o a15mpcore.o
obj-y += armv7m_nvic.o
obj-y += pxa2xx_timer.o pxa2xx_dma.o
obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
obj-y += zaurus.o
obj-y += omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
obj-y += omap_dma.o omap_clk.o omap_mmc.o \
omap_gpio.o omap_intc.o omap_uart.o
obj-y += soc_dma.o omap_gptimer.o omap_synctimer.o \
omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
obj-y += tsc210x.o
obj-y += cbus.o tusb6010.o
obj-y += mst_fpga.o
obj-y += bitbang_i2c.o
obj-y += strongarm.o
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
obj-$(CONFIG_KVM) += kvm/arm_gic.o
Expand Down
3 changes: 3 additions & 0 deletions hw/i2c/Makefile.objs
Expand Up @@ -2,3 +2,6 @@ common-obj-y += core.o smbus.o smbus_eeprom.o
common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
common-obj-$(CONFIG_ACPI) += smbus_ich9.o
common-obj-$(CONFIG_APM) += pm_smbus.o
common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
obj-$(CONFIG_OMAP) += omap_i2c.o
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 53ed424

Please sign in to comment.