From 45034afe3f06183a448c72b95a9de40c47cbf262 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Thu, 19 Nov 2009 16:42:45 +0000 Subject: [PATCH] Built network devices once Move some generic NICS into libhw, and build them for ARM targets. Signed-off-by: Paul Brook --- Makefile.hw | 3 +++ Makefile.target | 3 +-- default-configs/arm-softmmu.mak | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index f4b4469..bd252f5 100644 --- 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 91aa4a2..b9888f0 100644 --- 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 a30393d..35d2cb9 100644 --- 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 -- 2.7.4