]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw: move NICs to hw/net/, configure via default-configs/
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Feb 2013 11:33:56 +0000 (12:33 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 8 Apr 2013 16:13:13 +0000 (18:13 +0200)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
25 files changed:
default-configs/arm-softmmu.mak
default-configs/cris-softmmu.mak
default-configs/lm32-softmmu.mak
default-configs/m68k-softmmu.mak
default-configs/microblaze-softmmu.mak
default-configs/microblazeel-softmmu.mak
default-configs/ppc-softmmu.mak
default-configs/ppc64-softmmu.mak
default-configs/ppcemb-softmmu.mak
default-configs/sparc-softmmu.mak
hw/arm/Makefile.objs
hw/cris/Makefile.objs
hw/lm32/Makefile.objs
hw/m68k/Makefile.objs
hw/microblaze/Makefile.objs
hw/net/Makefile.objs
hw/net/etraxfs_eth.c [moved from hw/etraxfs_eth.c with 100% similarity]
hw/net/lance.c [moved from hw/lance.c with 100% similarity]
hw/net/mcf_fec.c [moved from hw/mcf_fec.c with 100% similarity]
hw/net/milkymist-minimac2.c [moved from hw/milkymist-minimac2.c with 100% similarity]
hw/net/spapr_llan.c [moved from hw/spapr_llan.c with 100% similarity]
hw/net/stellaris_enet.c [moved from hw/stellaris_enet.c with 100% similarity]
hw/net/xilinx_ethlite.c [moved from hw/xilinx_ethlite.c with 100% similarity]
hw/ppc/Makefile.objs
hw/sparc/Makefile.objs

index 4b72019878ce56fd62736b2330a687813d6f5777..cd353bd1fc23eea6a22d82be4a284ceacf83da12 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_TSC2005=y
 CONFIG_LM832X=y
 CONFIG_TMP105=y
 CONFIG_STELLARIS_INPUT=y
+CONFIG_STELLARIS_ENET=y
 CONFIG_SSD0303=y
 CONFIG_SSD0323=y
 CONFIG_ADS7846=y
index 1a479cd8d3ea4b39e9e78dd2fd0294ada830ce24..d970d50158b7429f6209f9d4b71db3e730424545 100644 (file)
@@ -1,5 +1,6 @@
 # Default configuration for cris-softmmu
 
+CONFIG_ETRAXFS=y
 CONFIG_NAND=y
 CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
index 0d19974b40b290878201e612e54147b9e3c9f4e8..2654ad6e449bec6cee0873d1a97a5437db463ff6 100644 (file)
@@ -1,5 +1,6 @@
 # Default configuration for lm32-softmmu
 
+CONFIG_MILKYMIST=y
 CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
index 778ea82a10fb7311252c54a84223c13c5bd1ec9a..51fe5bb3215016b32546413db3db8b1f4d35828b 100644 (file)
@@ -2,5 +2,6 @@
 
 include pci.mak
 include usb.mak
+CONFIG_COLDFIRE=y
 CONFIG_GDBSTUB_XML=y
 CONFIG_PTIMER=y
index 2f442e5aea0def706f36f1aa9e5a544d5662d6da..050e273580cef4fb1404feb924728cff69388cd2 100644 (file)
@@ -5,5 +5,6 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_SERIAL=y
 CONFIG_XILINX=y
 CONFIG_XILINX_AXI=y
+CONFIG_XILINX_ETHLITE=y
 CONFIG_SSI=y
 CONFIG_SSI_M25P80=y
index af9a3cde0d8e899e96d10ec9ddb978e0e66bb10a..db82dd8086f3607ac4b2549078b600d20ba0b33a 100644 (file)
@@ -5,5 +5,6 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_SERIAL=y
 CONFIG_XILINX=y
 CONFIG_XILINX_AXI=y
+CONFIG_XILINX_ETHLITE=y
 CONFIG_SSI=y
 CONFIG_SSI_M25P80=y
index d9ced3ada0f2df89a1a8ce5d441c89164f0007ed..36a8ed3f7b6724ff58857efd16b08d65d843e27b 100644 (file)
@@ -40,6 +40,7 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
+CONFIG_XILINX_ETHLITE=y
 CONFIG_E500=$(CONFIG_FDT)
 # For PReP
 CONFIG_MC146818RTC=y
index 7d62e1495dac2d3a470c8cd97ae82b65ac619de0..2d5df773056d80e1571cd4f03f7c849afb4b24d9 100644 (file)
@@ -40,6 +40,7 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
+CONFIG_XILINX_ETHLITE=y
 CONFIG_PSERIES=$(CONFIG_FDT)
 CONFIG_E500=$(CONFIG_FDT)
 # For pSeries
index 9d8c5c774221c9739997584ca79b89433069ca1f..ce705a93c1575f7aaba05fee06785047e126cb2d 100644 (file)
@@ -35,6 +35,7 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
+CONFIG_XILINX_ETHLITE=y
 CONFIG_E500=$(CONFIG_FDT)
 # For PReP
 CONFIG_MC146818RTC=y
index b0310c51e20c59ba4af9e7b7f5caef5296ddc39d..6d11ba03690d2c7b74af2e0b2aef19215b0dfe0a 100644 (file)
@@ -8,3 +8,4 @@ CONFIG_PTIMER=y
 CONFIG_FDC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_PCNET_COMMON=y
+CONFIG_LANCE=y
index d809ad858af656d493ed0423bb222eac4053b597..b14beb86efb25fc1e0cb0829a4ef8de763b686cc 100644 (file)
@@ -8,7 +8,7 @@ obj-y += exynos4210_uart.o exynos4210_pwm.o
 obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
 obj-y += exynos4210_rtc.o exynos4210_i2c.o
 obj-y += arm_mptimer.o a15mpcore.o
-obj-y += armv7m_nvic.o stellaris_enet.o
+obj-y += armv7m_nvic.o
 obj-y += pxa2xx_timer.o pxa2xx_dma.o
 obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
 obj-y += zaurus.o tc6393xb.o
index a94c62450d308e8c9b4f654d0105c754877460af..e02365d5cdc0b841672e23458e13d89edb4ac7ae 100644 (file)
@@ -1,7 +1,6 @@
 # IO blocks
 obj-y += etraxfs_dma.o
 obj-y += etraxfs_pic.o
-obj-y += etraxfs_eth.o
 obj-y += etraxfs_timer.o
 obj-y += etraxfs_ser.o
 
index 68ca90a3e2b491f2a25b550d664ef7cd36252442..d72756c8778ef0b2d887f4f080c0eb8cd770f6e0 100644 (file)
@@ -7,7 +7,6 @@ obj-y += lm32_sys.o
 obj-y += milkymist-ac97.o
 obj-y += milkymist-hpdmc.o
 obj-y += milkymist-memcard.o
-obj-y += milkymist-minimac2.o
 obj-y += milkymist-pfpu.o
 obj-y += milkymist-softusb.o
 obj-y += milkymist-sysctl.o
index ede32a7c4ef00bd1a0a0a0ae416f640f25270cf5..ebbe0038042f5a3cd59d5fb855cf149922237f96 100644 (file)
@@ -1,4 +1,4 @@
-obj-y = mcf_uart.o mcf_fec.o
+obj-y = mcf_uart.o
 
 obj-y := $(addprefix ../,$(obj-y))
 
index 9e7f249941a7f6b6e003f61c9986851106ab765a..75f5ce6cfe1b87098056a986b6786194e525e795 100644 (file)
@@ -1,5 +1,4 @@
 obj-y += xilinx_spi.o
-obj-y += xilinx_ethlite.o
 
 obj-y := $(addprefix ../,$(obj-y))
 
index 73217d80ae7c0142849b7a0fb55d55ce452d2cc6..951cca3a4b8c2cf31675d29b7e18cd5d032e3de5 100644 (file)
@@ -20,6 +20,14 @@ common-obj-$(CONFIG_MIPSNET) += mipsnet.o
 common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
 
 common-obj-$(CONFIG_CADENCE) += cadence_gem.o
+common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o
+common-obj-$(CONFIG_LANCE) += lance.o
+
+obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
+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
 
 obj-$(CONFIG_VIRTIO) += virtio-net.o
 obj-y += vhost_net.o
similarity index 100%
rename from hw/etraxfs_eth.c
rename to hw/net/etraxfs_eth.c
similarity index 100%
rename from hw/lance.c
rename to hw/net/lance.c
similarity index 100%
rename from hw/mcf_fec.c
rename to hw/net/mcf_fec.c
similarity index 100%
rename from hw/spapr_llan.c
rename to hw/net/spapr_llan.c
similarity index 100%
rename from hw/stellaris_enet.c
rename to hw/net/stellaris_enet.c
similarity index 100%
rename from hw/xilinx_ethlite.c
rename to hw/net/xilinx_ethlite.c
index b22a6f1ce41c456d83899f021b45fe2442be49c2..42c7d087823fb354c0c065c1afa20b007e689077 100644 (file)
@@ -1,5 +1,5 @@
 # IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o
+obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_vscsi.o
 obj-$(CONFIG_PSERIES) += spapr_pci.o
 obj-$(CONFIG_PSERIES) += spapr_nvram.o
 # PowerPC 4xx boards
@@ -7,9 +7,6 @@ obj-y += ppc4xx_pci.o
 # PowerPC OpenPIC
 obj-y += openpic.o
 
-# Xilinx PPC peripherals
-obj-y += xilinx_ethlite.o
-
 obj-y := $(addprefix ../,$(obj-y))
 
 # shared objects
index 71bbddf8c31c8e441360c7a762aaefe508e01e07..56eeb9012b7b3678469469e4af98862c68675066 100644 (file)
@@ -1,4 +1,4 @@
-obj-y = lance.o tcx.o sun4m_iommu.o slavio_intctl.o
+obj-y = tcx.o sun4m_iommu.o slavio_intctl.o
 obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o
 obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o