Built network devices once

Move some generic NICS into libhw, and build them for ARM targets.

Signed-off-by: Paul Brook <paul@codesourcery.com>

diff --git a/Makefile.hw b/Makefile.hw
index f4b4469a885fb98aa0db7808c916965a8c67558d..bd252f5ed0ae6cafece8ed8580aed2dce6efe834 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -30,6 +30,9 @@ obj-y += msix.o
 # PCI network cards
 obj-y += ne2000.o
 
+obj-$(CONFIG_SMC91C111) += smc91c111.o
+obj-$(CONFIG_LAN9118) += lan9118.o
+
 # SCSI layer
 obj-y += lsi53c895a.o
 obj-$(CONFIG_ESP) += esp.o

diff --git a/Makefile.target b/Makefile.target
index 91aa4a2997db39c60aa32a499729aaddc354cc6e..b9888f025f9e8a574e4087f3341ac7161d5926b0 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -267,7 +267,7 @@ obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
 obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
 endif
 
-obj-arm-y = integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o
+obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
 obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
 obj-arm-y += versatile_pci.o
 obj-arm-y += realview_gic.o realview.o arm_sysctl.o mpcore.o
@@ -288,7 +288,6 @@ obj-arm-y += framebuffer.o
 obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
 obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
 obj-arm-y += syborg_virtio.o
-obj-arm-y += lan9118.o
 
 obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
 obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index a30393d5f657e4a0be830e368bb537d80f0a2aad..35d2cb9c9cead45f8c547a3e4ccb8865185ff80a 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -20,3 +20,5 @@ CONFIG_ADS7846=y
 CONFIG_MAX111X=y
 CONFIG_SSI=y
 CONFIG_SSI_SD=y
+CONFIG_LAN9118=y
+CONFIG_SMC91C111=y