d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r260401

Browse Source 
Remove aicasm as a build dependency.  It made sense when the ahc and ahd
  drivers and their firmware were under active development, but those days
  have passed.  The firmware now exists in pre-compiled form, no longer
  dependent on it's sources or on aicasm.  If you wish to rebuild the
  firmware from source, the glue still exists under the 'make firmware'
  target in sys/modules/aic7xxx.

  This also fixes the problem introduced with r257777 et al with building
  kernels the old fashioned way in sys/$arch/compile/$CONFIG when the
  ahc/ahd drivers were included.
This commit is contained in:
ian 2014-08-21 17:18:21 +00:00
parent febf3f5203
commit b7f4763aaf
14 changed files with 13523 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc1
View File

@ -1383,15 +1383,6 @@ kernel-tools: .MAKE
mkdir -p ${MAKEOBJDIRPREFIX}/usr
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${MAKEOBJDIRPREFIX}/usr >/dev/null
.for _tool in \
sys/dev/aic7xxx/aicasm
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool} && \
${MAKE} DIRPRFX=${_tool}/ obj && \
${MAKE} DIRPRFX=${_tool}/ depend && \
${MAKE} DIRPRFX=${_tool}/ all && \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
.endfor
#
# cross-tools: Build cross-building tools

38
sys/conf/files
View File

@ -9,42 +9,6 @@ acpi_quirks.h optional acpi \
compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
no-obj no-implicit-rule before-depend \
clean "acpi_quirks.h"
aic7xxx_seq.h optional ahc \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
no-obj no-implicit-rule before-depend local \
clean "aic7xxx_seq.h" \
dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic7xxx_reg.h optional ahc \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
no-obj no-implicit-rule before-depend local \
clean "aic7xxx_reg.h" \
dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic7xxx_reg_print.c optional ahc \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
no-obj no-implicit-rule local \
clean "aic7xxx_reg_print.c" \
dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \
compile-with "${NORMAL_C}" \
no-implicit-rule local
aic79xx_seq.h optional ahd pci \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \
no-obj no-implicit-rule before-depend local \
clean "aic79xx_seq.h" \
dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic79xx_reg.h optional ahd pci \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \
no-obj no-implicit-rule before-depend local \
clean "aic79xx_reg.h" \
dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic79xx_reg_print.c optional ahd pci \
compile-with "aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \
no-obj no-implicit-rule local \
clean "aic79xx_reg_print.c" \
dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \
compile-with "${NORMAL_C}" \
no-implicit-rule local
#
# The 'fdt_dtb_file' target covers an actual DTB file name, which is derived
# from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
@ -670,10 +634,12 @@ dev/aic7xxx/aic7770.c optional ahc
dev/aic7xxx/aic79xx.c optional ahd pci
dev/aic7xxx/aic79xx_osm.c optional ahd pci
dev/aic7xxx/aic79xx_pci.c optional ahd pci
dev/aic7xxx/aic79xx_reg_print.c optional ahd pci ahd_reg_pretty_print
dev/aic7xxx/aic7xxx.c optional ahc
dev/aic7xxx/aic7xxx_93cx6.c optional ahc
dev/aic7xxx/aic7xxx_osm.c optional ahc
dev/aic7xxx/aic7xxx_pci.c optional ahc pci
dev/aic7xxx/aic7xxx_reg_print.c optional ahc ahc_reg_pretty_print
dev/alc/if_alc.c optional alc pci
dev/ale/if_ale.c optional ale pci
dev/altera/avgen/altera_avgen.c optional altera_avgen

3826
sys/dev/aic7xxx/aic79xx_reg.h Normal file
View File

File diff suppressed because it is too large Load Diff

3674
sys/dev/aic7xxx/aic79xx_reg_print.c Normal file
View File

File diff suppressed because it is too large Load Diff

1192
sys/dev/aic7xxx/aic79xx_seq.h Normal file
View File

File diff suppressed because it is too large Load Diff

1790
sys/dev/aic7xxx/aic7xxx_reg.h Normal file
View File

File diff suppressed because it is too large Load Diff

1684
sys/dev/aic7xxx/aic7xxx_reg_print.c Normal file
View File

File diff suppressed because it is too large Load Diff

1312
sys/dev/aic7xxx/aic7xxx_seq.h Normal file
View File

File diff suppressed because it is too large Load Diff

16
sys/modules/aic7xxx/Makefile
View File

@ -3,4 +3,20 @@
SUBDIR= ahc ahd
firmware: aicasm/aicasm ahdfirmware ahcfirmware
aicasm/aicasm:
( cd ${.CURDIR}/aicasm ; ${MAKE} aicasm )
ahdfirmware:
( cd ${.CURDIR}/ahd ; ${MAKE} ahdfirmware )
ahcfirmware:
( cd ${.CURDIR}/ahc ; ${MAKE} ahcfirmware )
cleanfirmware:
( cd .${CURDIR}/aicasm ; ${MAKE} clean )
( cd .${CURDIR}/ahc ; ${MAKE} cleanfirmware )
( cd .${CURDIR}/ahd ; ${MAKE} cleanfirmware )
.include <bsd.subdir.mk>

15
sys/modules/aic7xxx/ahc/Makefile
View File

@ -15,21 +15,34 @@ REG_PRINT_OPT= -p aic7xxx_reg_print.c
.endif
BEFORE_DEPEND = ${GENSRCS}
../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
.if make(ahcfirmware)
ahcfirmware: ${GENSRCS}
${GENSRCS}: \
${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq} \
${.CURDIR}/../../../cam/scsi/scsi_message.h
aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
-I${.CURDIR}/../../../dev/aic7xxx \
-o aic7xxx_seq.h -r aic7xxx_reg.h \
${REG_PRINT_OPT} \
-i ${.CURDIR}/../../../dev/aic7xxx/aic7xxx_osm.h \
${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq
.else
${GENSRCS}:
@echo "Error: ${.TARGET} is missing. Run 'make ahcfirmware'"
.endif
SRCS= ${GENSRCS}
SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c aic7770.c
SRCS+= opt_scsi.h opt_aic7xxx.h opt_cam.h
SRCS+= device_if.h bus_if.h pci_if.h
.if make(cleanfirmware)
cleanfirmware: clean
CLEANFILES= ${GENSRCS}
.endif
.include <bsd.kmod.mk>

7
sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
View File

@ -4,15 +4,10 @@
.PATH: ${.CURDIR}/../../../../dev/aic7xxx
KMOD= ahc_eisa
../aic7xxx_reg.h:
( cd .. ; ${MAKE} aic7xxx_reg.h )
SRCS= ahc_eisa.c ../aic7xxx_reg.h
SRCS= ahc_eisa.c
SRCS+= device_if.h bus_if.h eisa_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
CLEANFILES= ../aic7xxx_reg.h ../aic7xxx_seq.h
.include <bsd.kmod.mk>

7
sys/modules/aic7xxx/ahc/ahc_isa/Makefile
View File

@ -4,15 +4,10 @@
.PATH: ${.CURDIR}/../../../../dev/aic7xxx
KMOD= ahc_isa
../aic7xxx_reg.h:
( cd .. ; ${MAKE} aic7xxx_reg.h )
SRCS= ahc_isa.c ../aic7xxx_reg.h
SRCS= ahc_isa.c
SRCS+= device_if.h bus_if.h pci_if.h isa_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
CLEANFILES= ../aic7xxx_reg.h ../aic7xxx_seq.h
.include <bsd.kmod.mk>

5
sys/modules/aic7xxx/ahc/ahc_pci/Makefile
View File

@ -4,10 +4,7 @@
.PATH: ${.CURDIR}/../../../../dev/aic7xxx
KMOD= ahc_pci
../aic7xxx_reg.h:
( cd .. ; ${MAKE} aic7xxx_reg.h )
SRCS= ahc_pci.c aic7xxx_pci.c ../aic7xxx_reg.h
SRCS= ahc_pci.c aic7xxx_pci.c
SRCS+= device_if.h bus_if.h pci_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h

10
sys/modules/aic7xxx/ahd/Makefile
View File

@ -15,6 +15,8 @@ REG_PRINT_OPT= -p aic79xx_reg_print.c
.endif
BEFORE_DEPEND= ${GENSRCS}
.if make(ahdfirmware)
ahdfirmware: ${GENSRCS}
${GENSRCS}: \
${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq} \
${.CURDIR}/../../../cam/scsi/scsi_message.h
@ -24,13 +26,21 @@ ${GENSRCS}: \
${REG_PRINT_OPT} \
-i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \
${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq
.else
${GENSRCS}:
@echo "Error: ${.TARGET} is missing. Run 'make ahdfirmware'."
.endif
SRCS= ${GENSRCS}
SRCS+= aic79xx.c aic79xx_osm.c aic79xx_pci.c ahd_pci.c
SRCS+= opt_scsi.h opt_aic79xx.h opt_cam.h opt_ddb.h
SRCS+= device_if.h bus_if.h pci_if.h
.if make(cleanfirmware)
cleanfirmware: clean
CLEANFILES= ${GENSRCS}
.endif
.include <bsd.kmod.mk>