From 44ac0964e903d1aef721941ede882fc1ececcec0 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Tue, 31 Jan 2006 22:34:13 +0000 Subject: [PATCH] Hook up le(4) to the build. For now it's only added to the sparc64 GENERIC in order to support the on-board LANCE in Ultra 1 and to the MI NOTES as it should work just fine with the AMD PCnet family of chips on all archs but is not yet meant to replace lnc(4). If a kernel includes all of le(4), lnc(4) and pcn(4) precedence is given to lnc(4)/pcn(4) for now. --- sys/conf/NOTES | 2 ++ sys/conf/files | 4 ++++ sys/conf/files.sparc64 | 1 + sys/modules/Makefile | 1 + sys/modules/le/Makefile | 14 ++++++++++++++ sys/sparc64/conf/GENERIC | 4 ++-- 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 sys/modules/le/Makefile diff --git a/sys/conf/NOTES b/sys/conf/NOTES index fde97a859aa1..ee0c4a12de96 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1731,6 +1731,7 @@ device miibus # fxp: Intel EtherExpress Pro/100B # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping) # hme: Sun HME (Happy Meal Ethernet) +# le: AMD Am7900 LANCE and Am79C9xx PCnet # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. @@ -1846,6 +1847,7 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device le # AMD Am7900 LANCE and Am79C9xx PCnet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') diff --git a/sys/conf/files b/sys/conf/files index 07c44fcf611a..8ee7219f5d6a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -679,6 +679,10 @@ dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard dev/kbdmux/kbdmux.c optional kbdmux +dev/le/am7990.c optional le +dev/le/am79900.c optional le +dev/le/if_le_pci.c optional le pci +dev/le/lance.c optional le dev/led/led.c standard dev/lge/if_lge.c optional lge dev/lmc/if_lmc.c optional lmc diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 76a4535c53a0..5c82173f170c 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -36,6 +36,7 @@ dev/fb/machfb.c optional machfb sc dev/fb/splash.c optional splash dev/hwpmc/hwpmc_sparc64.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd +dev/le/if_le_ledma.c optional le sbus dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console diff --git a/sys/modules/Makefile b/sys/modules/Makefile index c19fdf503152..f9d7e5a4becc 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -122,6 +122,7 @@ SUBDIR= ${_3dfx} \ joy \ kbdmux \ kue \ + le \ lge \ libalias \ libiconv \ diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile new file mode 100644 index 000000000000..23bb93b4b577 --- /dev/null +++ b/sys/modules/le/Makefile @@ -0,0 +1,14 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../dev/le + +KMOD= if_le +SRCS= am7990.c am79900.c ${if_le_ledma} if_le_pci.c lance.c +SRCS+= bus_if.h device_if.h ${ofw_bus_if} pci_if.h + +.if ${MACHINE_ARCH} == "sparc64" +if_le_ledma= if_le_ledma.c +ofw_bus_if= ofw_bus_if.h +.endif + +.include diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index dad94b5a1313..7d4e0e300110 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -157,7 +157,7 @@ device puc # Multi-channel uarts #device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card #device ixgb # Intel PRO/10GbE Ethernet Card -#device lnc # NE2100, NE32-VL Lance Ethernet cards +device le # AMD Am7900 LANCE and Am79C9xx PCnet #device txp # 3Com 3cR990 (``Typhoon'') #device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -170,7 +170,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device gem # Sun GEM/Sun ERI/Apple GMAC device hme # Sun HME (Happy Meal Ethernet) -#device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +#device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 #device sf # Adaptec AIC-6915 (``Starfire'')