Author: jhb
Date: Sun Oct 7 21:32:41 2012
New Revision: 241334
URL: http://svn.freebsd.org/changeset/base/241334
Log:
MFC 239955-239957:
Cleanups and fixes for building firmware modules into a kernel:
- Add common rules for building firmware object files (NORMAL_FW to run
uudecode, and NORMAL_FWO to use ld to build the .fwo file) and use those
instead of explicit ld/uudecode invocations in sys/conf/files. Apart from
increasing readability, this makes it possible to adjust the flags used for
firmware objects in one place.
- Similar to how r171350 fixed linking of kernel modules containing
firmware objects by adding --no-warn-mismatch to the linker flags,
add --no-warn-mismatch when linking firmware objects (*.fwo) as
well as to the link of the main kernel file. This permits firmware
modules to be statically linked into an ia64 kernel.
Modified:
stable/9/sys/conf/files
stable/9/sys/conf/kern.pre.mk
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/files
==============================================================================
--- stable/9/sys/conf/files Sun Oct 7 20:36:46 2012 (r241333)
+++ stable/9/sys/conf/files Sun Oct 7 21:32:41 2012 (r241334)
@@ -1163,12 +1163,12 @@ ipwbssfw.c optional ipwbssfw |
ipwfw
clean "ipwbssfw.c"
ipw_bss.fwo optional ipwbssfw | ipwfw \
dependency "ipw_bss.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
ipw_bss.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "ipw_bss.fwo"
ipw_bss.fw optional ipwbssfw | ipwfw \
dependency "$S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "ipw_bss.fw"
ipwibssfw.c optional ipwibssfw | ipwfw \
@@ -1177,12 +1177,12 @@ ipwibssfw.c optional ipwibssfw |
ipwfw
clean "ipwibssfw.c"
ipw_ibss.fwo optional ipwibssfw | ipwfw \
dependency "ipw_ibss.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
ipw_ibss.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "ipw_ibss.fwo"
ipw_ibss.fw optional ipwibssfw | ipwfw \
dependency "$S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "ipw_ibss.fw"
ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
@@ -1191,12 +1191,12 @@ ipwmonitorfw.c optional ipwmonitorfw |
clean "ipwmonitorfw.c"
ipw_monitor.fwo optional ipwmonitorfw | ipwfw
\
dependency "ipw_monitor.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
ipw_monitor.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "ipw_monitor.fwo"
ipw_monitor.fw optional ipwmonitorfw | ipwfw \
dependency "$S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
@@ -1219,12 +1219,12 @@ iwibssfw.c optional iwibssfw |
iwifw
clean "iwibssfw.c"
iwi_bss.fwo optional iwibssfw | iwifw \
dependency "iwi_bss.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwi_bss.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwi_bss.fwo"
iwi_bss.fw optional iwibssfw | iwifw \
dependency "$S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwi_bss.fw"
iwiibssfw.c optional iwiibssfw | iwifw \
@@ -1233,12 +1233,12 @@ iwiibssfw.c optional iwiibssfw |
iwifw
clean "iwiibssfw.c"
iwi_ibss.fwo optional iwiibssfw | iwifw \
dependency "iwi_ibss.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwi_ibss.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwi_ibss.fwo"
iwi_ibss.fw optional iwiibssfw | iwifw \
dependency "$S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwi_ibss.fw"
iwimonitorfw.c optional iwimonitorfw | iwifw \
@@ -1247,12 +1247,12 @@ iwimonitorfw.c optional iwimonitorfw |
clean "iwimonitorfw.c"
iwi_monitor.fwo optional iwimonitorfw | iwifw
\
dependency "iwi_monitor.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwi_monitor.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwi_monitor.fwo"
iwi_monitor.fw optional iwimonitorfw | iwifw \
dependency "$S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwi_monitor.fw"
dev/iwn/if_iwn.c optional iwn
@@ -1262,12 +1262,12 @@ iwn1000fw.c optional iwn1000fw |
iwnfw
clean "iwn1000fw.c"
iwn1000fw.fwo optional iwn1000fw | iwnfw \
dependency "iwn1000.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn1000.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn1000fw.fwo"
iwn1000.fw optional iwn1000fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn1000.fw"
iwn4965fw.c optional iwn4965fw | iwnfw \
@@ -1276,12 +1276,12 @@ iwn4965fw.c optional iwn4965fw |
iwnfw
clean "iwn4965fw.c"
iwn4965fw.fwo optional iwn4965fw | iwnfw \
dependency "iwn4965.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn4965.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn4965fw.fwo"
iwn4965.fw optional iwn4965fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn4965.fw"
iwn5000fw.c optional iwn5000fw | iwnfw \
@@ -1290,12 +1290,12 @@ iwn5000fw.c optional iwn5000fw |
iwnfw
clean "iwn5000fw.c"
iwn5000fw.fwo optional iwn5000fw | iwnfw \
dependency "iwn5000.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn5000.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn5000fw.fwo"
iwn5000.fw optional iwn5000fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn5000.fw"
iwn5150fw.c optional iwn5150fw | iwnfw \
@@ -1304,12 +1304,12 @@ iwn5150fw.c optional iwn5150fw |
iwnfw
clean "iwn5150fw.c"
iwn5150fw.fwo optional iwn5150fw | iwnfw \
dependency "iwn5150.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn5150.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn5150fw.fwo"
iwn5150.fw optional iwn5150fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu"\
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn5150.fw"
iwn6000fw.c optional iwn6000fw | iwnfw \
@@ -1318,12 +1318,12 @@ iwn6000fw.c optional iwn6000fw |
iwnfw
clean "iwn6000fw.c"
iwn6000fw.fwo optional iwn6000fw | iwnfw \
dependency "iwn6000.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn6000.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn6000fw.fwo"
iwn6000.fw optional iwn6000fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn6000.fw"
iwn6000g2afw.c optional iwn6000g2afw | iwnfw \
@@ -1332,12 +1332,12 @@ iwn6000g2afw.c optional iwn6000g2afw |
clean "iwn6000g2afw.c"
iwn6000g2afw.fwo optional iwn6000g2afw | iwnfw \
dependency "iwn6000g2a.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn6000g2a.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn6000g2afw.fwo"
iwn6000g2a.fw optional iwn6000g2afw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn6000g2a.fw"
iwn6000g2bfw.c optional iwn6000g2bfw | iwnfw \
@@ -1346,12 +1346,12 @@ iwn6000g2bfw.c optional iwn6000g2bfw |
clean "iwn6000g2bfw.c"
iwn6000g2bfw.fwo optional iwn6000g2bfw | iwnfw \
dependency "iwn6000g2b.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn6000g2b.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn6000g2bfw.fwo"
iwn6000g2b.fw optional iwn6000g2bfw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn6000g2b.fw"
iwn6050fw.c optional iwn6050fw | iwnfw \
@@ -1360,12 +1360,12 @@ iwn6050fw.c optional iwn6050fw |
iwnfw
clean "iwn6050fw.c"
iwn6050fw.fwo optional iwn6050fw | iwnfw \
dependency "iwn6050.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
iwn6050.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "iwn6050fw.fwo"
iwn6050.fw optional iwn6050fw | iwnfw \
dependency "$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn6050.fw"
dev/ixgb/if_ixgb.c optional ixgb
@@ -1494,22 +1494,22 @@ mwlfw.c optional mwlfw
\
clean "mwlfw.c"
mw88W8363.fwo optional mwlfw \
dependency "mw88W8363.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
mw88W8363.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "mw88W8363.fwo"
mw88W8363.fw optional mwlfw \
dependency "$S/contrib/dev/mwl/mw88W8363.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/mwl/mw88W8363.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "mw88W8363.fw"
mwlboot.fwo optional mwlfw \
dependency "mwlboot.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
mwlboot.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "mwlboot.fwo"
mwlboot.fw optional mwlfw \
dependency "$S/contrib/dev/mwl/mwlboot.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/mwl/mwlboot.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "mwlboot.fw"
dev/mxge/if_mxge.c optional mxge pci
@@ -1626,12 +1626,12 @@ rt2561fw.c optional rt2561fw |
ralfw
clean "rt2561fw.c"
rt2561fw.fwo optional rt2561fw | ralfw \
dependency "rt2561.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
rt2561.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "rt2561fw.fwo"
rt2561.fw optional rt2561fw | ralfw \
dependency "$S/contrib/dev/ral/rt2561.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ral/rt2561.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "rt2561.fw"
rt2561sfw.c optional rt2561sfw | ralfw \
@@ -1640,12 +1640,12 @@ rt2561sfw.c optional rt2561sfw |
ralfw
clean "rt2561sfw.c"
rt2561sfw.fwo optional rt2561sfw | ralfw \
dependency "rt2561s.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
rt2561s.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "rt2561sfw.fwo"
rt2561s.fw optional rt2561sfw | ralfw \
dependency "$S/contrib/dev/ral/rt2561s.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ral/rt2561s.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "rt2561s.fw"
rt2661fw.c optional rt2661fw | ralfw \
@@ -1654,12 +1654,12 @@ rt2661fw.c optional rt2661fw |
ralfw
clean "rt2661fw.c"
rt2661fw.fwo optional rt2661fw | ralfw \
dependency "rt2661.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
rt2661.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "rt2661fw.fwo"
rt2661.fw optional rt2661fw | ralfw \
dependency "$S/contrib/dev/ral/rt2661.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ral/rt2661.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "rt2661.fw"
rt2860fw.c optional rt2860fw | ralfw \
@@ -1668,12 +1668,12 @@ rt2860fw.c optional rt2860fw |
ralfw
clean "rt2860fw.c"
rt2860fw.fwo optional rt2860fw | ralfw \
dependency "rt2860.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
rt2860.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "rt2860fw.fwo"
rt2860.fw optional rt2860fw | ralfw \
dependency "$S/contrib/dev/ral/rt2860.fw.uu" \
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/ral/rt2860.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "rt2860.fw"
dev/random/harvest.c standard
@@ -1958,12 +1958,12 @@ runfw.c optional runfw
\
clean "runfw.c"
runfw.fwo optional runfw
\
dependency "runfw"
\
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
runfw" \
+ compile-with "${NORMAL_FWO}"
\
no-implicit-rule
\
clean "runfw.fwo"
runfw optional runfw
\
dependency "$S/contrib/dev/run/rt2870.fw.uu"
\
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/run/rt2870.fw.uu" \
+ compile-with "${NORMAL_FW}"
\
no-obj no-implicit-rule
\
clean "runfw"
dev/usb/wlan/if_uath.c optional uath
@@ -2071,12 +2071,12 @@ wpifw.c optional wpifw
\
clean "wpifw.c"
wpifw.fwo optional wpifw \
dependency "wpi.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET}
wpi.fw" \
+ compile-with "${NORMAL_FWO}" \
no-implicit-rule \
clean "wpifw.fwo"
wpi.fw optional wpifw \
dependency "$S/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu"
\
- compile-with "uudecode -o ${.TARGET}
$S/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu" \
+ compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "wpi.fw"
dev/xe/if_xe.c optional xe
Modified: stable/9/sys/conf/kern.pre.mk
==============================================================================
--- stable/9/sys/conf/kern.pre.mk Sun Oct 7 20:36:46 2012
(r241333)
+++ stable/9/sys/conf/kern.pre.mk Sun Oct 7 21:32:41 2012
(r241334)
@@ -131,6 +131,10 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
+NORMAL_FW= uudecode -o ${.TARGET} ${.ALLSRC}
+NORMAL_FWO= ${LD} -b binary --no-warn-mismatch -d -warn-common -r \
+ -o ${.TARGET} ${.ALLSRC:M*.fw}
+
NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
@@ -151,7 +155,7 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
SYSTEM_OBJS+= hack.So
SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE}
${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
-SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \
+SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} --no-warn-mismatch \
-warn-common -export-dynamic -dynamic-linker /red/herring \
-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
