- Enable static building of mxge(4) and its firmware.

- Add custom .c wrappers for the firmware, rather than the standard
  firmware(9) generated firmware objects to work around toolchain
  problems on ia64 involving linking objects produced by
  ld -b -binary into the kernel.

- Move from using Myricom's ".dat" firmware blobs to using Myricom's
  zlib compressed ".h" firmware header files.  This is done to
  facilitate the custom wrappers, and saves a fair amount of wired
  memory in the case where the firmware is built in, or preloaded.

- Fix two compile issues in mxge which only appear on non-i386/amd64.

Reviewed by: mlaier, mav (earlier version with just zlib support)
Glanced at by: sam
Approved by: re (kensmith)

2 files changed, 4 insertions, 16 deletions

diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile
index ae3cb49..3454581 100644
--- a/sys/modules/mxge/mxge_eth_z8e/Makefile
+++ b/sys/modules/mxge/mxge_eth_z8e/Makefile
@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-MXGE= ${.CURDIR}/../../../dev/mxge
-.PATH= ${MXGE}
+.PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_eth_z8e
-FIRMWS=	eth_z8e.dat:mxge_eth_z8e
-CLEANFILES+= eth_z8e.dat
-
-eth_z8e.dat: ${MXGE}/eth_z8e.dat.gz.uu
-	uudecode -p < ${MXGE}/eth_z8e.dat.gz.uu \
-		| gzip -dc > ${.TARGET}
+SRCS=	mxge_eth_z8e.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile
index 54b76c1..e9f9b31 100644
--- a/sys/modules/mxge/mxge_ethp_z8e/Makefile
+++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile
@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-MXGE= ${.CURDIR}/../../../dev/mxge
-.PATH= ${MXGE}
+.PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_ethp_z8e
-FIRMWS=	ethp_z8e.dat:mxge_ethp_z8e
-CLEANFILES+= ethp_z8e.dat
-
-ethp_z8e.dat: ${MXGE}/ethp_z8e.dat.gz.uu
-	uudecode -p < ${MXGE}/ethp_z8e.dat.gz.uu \
-		| gzip -dc > ${.TARGET}
+SRCS=	mxge_ethp_z8e.c
 
 .include <bsd.kmod.mk>