diff options
Diffstat (limited to 'usr/src/uts/intel/Makefile.intel.shared')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 73 |
1 files changed, 48 insertions, 25 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index 22f043eaeb..8a923fd369 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -146,16 +146,6 @@ AS_INC_PATH += -I$(GENASSYM_DIR)/$(OBJS_DIR) BASE_INS_DIR = $(ROOT) # -# -# Simulator flag -# -i386_SIMULATOR = -D_SIMULATOR_SUPPORT -amd64_SIMULATOR = -D_SIMULATOR_SUPPORT - -SIMULATOR = $($(MACH)_SIMULATOR) - - -# # Debugging level # # Special knowledge of which special debugging options affect which @@ -163,10 +153,8 @@ SIMULATOR = $($(MACH)_SIMULATOR) # DEBUG_DEFS_OBJ32 = DEBUG_DEFS_DBG32 = -DDEBUG -DEBUG_DEFS_DBG32 += $(SIMULATOR) DEBUG_DEFS_OBJ64 = DEBUG_DEFS_DBG64 = -DDEBUG -DEBUG_DEFS_DBG64 += $(SIMULATOR) DEBUG_DEFS = $(DEBUG_DEFS_$(BUILD_TYPE)) DEBUG_COND_OBJ32 :sh = echo \\043 @@ -216,10 +204,17 @@ ALL_DEFS = $(DEBUG_DEFS) $(OPTION_DEFS) DRV_KMODS += aac DRV_KMODS += aggr DRV_KMODS += ahci +DRV_KMODS += amd64_gart DRV_KMODS += amr +DRV_KMODS += agpgart +DRV_KMODS += agptarget DRV_KMODS += arp DRV_KMODS += asy +DRV_KMODS += ata DRV_KMODS += ath +DRV_KMODS += audio810 +DRV_KMODS += audiohd +DRV_KMODS += audioixp DRV_KMODS += bl DRV_KMODS += bge DRV_KMODS += bofi @@ -233,10 +228,14 @@ DRV_KMODS += crypto DRV_KMODS += cryptoadm DRV_KMODS += devinfo DRV_KMODS += dld +DRV_KMODS_32 += dnet DRV_KMODS += dump DRV_KMODS += ecpp +DRV_KMODS += fd +DRV_KMODS += fdc DRV_KMODS += fssnap DRV_KMODS += i8042 +DRV_KMODS += i915 DRV_KMODS += icmp DRV_KMODS += icmp6 DRV_KMODS += ip @@ -246,6 +245,7 @@ DRV_KMODS += ippctl DRV_KMODS += ipsecah DRV_KMODS += ipsecesp DRV_KMODS += iwscn +DRV_KMODS += kb8042 DRV_KMODS += keysock DRV_KMODS += kssl DRV_KMODS += kstat @@ -254,15 +254,22 @@ DRV_KMODS += kmdb DRV_KMODS += llc1 DRV_KMODS += lofi DRV_KMODS += log +DRV_KMODS += logi DRV_KMODS += logindmux DRV_KMODS += mm DRV_KMODS += mouse8042 +DRV_KMODS_32 += mscsi +DRV_KMODS_32 += msm DRV_KMODS += nca DRV_KMODS += openeepr +DRV_KMODS += pci_pci +DRV_KMODS += pcic +DRV_KMODS += pcie_pci DRV_KMODS += physmem DRV_KMODS += pm DRV_KMODS += poll DRV_KMODS += pool +DRV_KMODS += power DRV_KMODS += pseudo DRV_KMODS += ptc DRV_KMODS += ptm @@ -280,8 +287,8 @@ DRV_KMODS += sctp6 DRV_KMODS += sd DRV_KMODS += sgen DRV_KMODS += si3124 -DRV_KMODS += spdsock DRV_KMODS += smbios +DRV_KMODS += spdsock DRV_KMODS += sppp DRV_KMODS += sppptun DRV_KMODS += st @@ -307,11 +314,22 @@ DRV_KMODS += zcons # $(CLOSED_BUILD)DRV_KMODS += dca -$(CLOSED_BUILD)CLOSED_DRV_KMODS += chxge -$(CLOSED_BUILD)CLOSED_DRV_KMODS += glm -$(CLOSED_BUILD)CLOSED_DRV_KMODS += llc2 -$(CLOSED_BUILD)CLOSED_DRV_KMODS += mpt -$(CLOSED_BUILD)CLOSED_DRV_KMODS += marvell88sx +$(CLOSED_BUILD)CLOSED_DRV_KMODS += audioens +$(CLOSED_BUILD)CLOSED_DRV_KMODS += audiovia823x +$(CLOSED_BUILD)CLOSED_DRV_KMODS += bmc +$(CLOSED_BUILD)CLOSED_DRV_KMODS += bscbus +$(CLOSED_BUILD)CLOSED_DRV_KMODS += bscv +$(CLOSED_BUILD)CLOSED_DRV_KMODS += chxge +$(CLOSED_BUILD)CLOSED_DRV_KMODS += elxl +$(CLOSED_BUILD)CLOSED_DRV_KMODS += glm +$(CLOSED_BUILD)CLOSED_DRV_KMODS += iprb +$(CLOSED_BUILD)CLOSED_DRV_KMODS += llc2 +$(CLOSED_BUILD)CLOSED_DRV_KMODS += marvell88sx +$(CLOSED_BUILD)CLOSED_DRV_KMODS += mpt +$(CLOSED_BUILD)CLOSED_DRV_KMODS_32 += ncrs +$(CLOSED_BUILD)CLOSED_DRV_KMODS += pcn +$(CLOSED_BUILD)CLOSED_DRV_KMODS += rtls +$(CLOSED_BUILD)CLOSED_DRV_KMODS_32 += sbpro # # Common code drivers @@ -446,6 +464,11 @@ STRMOD_KMODS += usb_ah STRMOD_KMODS += drcompat STRMOD_KMODS += nattymod STRMOD_KMODS += cryptmod +STRMOD_KMODS += vuid2ps2 +STRMOD_KMODS += vuid3ps2 +STRMOD_KMODS += vuidm3p +STRMOD_KMODS += vuidm4p +STRMOD_KMODS += vuidm5p # # 'System' Modules (/kernel/sys): @@ -470,8 +493,11 @@ SYS_KMODS += acctctl # MISC_KMODS_32 are built only 32-bit # MISC_KMODS_64 are built only 64-bit # +MISC_KMODS += acpica +MISC_KMODS += agpmaster MISC_KMODS += amsrc2 MISC_KMODS += audiosup +MISC_KMODS += bootdev MISC_KMODS += busra MISC_KMODS += cmlb MISC_KMODS += consconfig @@ -479,6 +505,7 @@ MISC_KMODS += ctf MISC_KMODS += dadk MISC_KMODS += diaudio MISC_KMODS += dls +MISC_KMODS += drm MISC_KMODS += fssnap_if MISC_KMODS += gda MISC_KMODS += gld @@ -496,14 +523,15 @@ MISC_KMODS += kcf MISC_KMODS += kgssapi MISC_KMODS += kmech_dummy MISC_KMODS += kmech_krb5 -MISC_KMODS += krtld MISC_KMODS += mac MISC_KMODS += mixer MISC_KMODS += net80211 MISC_KMODS += nfs_dlboot MISC_KMODS += nfssrv MISC_KMODS += neti +MISC_KMODS += pci_autoconfig MISC_KMODS += pcicfg +MISC_KMODS += pciehpc MISC_KMODS += pcihp MISC_KMODS += pcmcia MISC_KMODS += rpcsec @@ -517,7 +545,6 @@ MISC_KMODS += sysinit MISC_KMODS += tem MISC_KMODS += tlimod MISC_KMODS += usba usba10 usbs49_fw -MISC_KMODS += zmod $(CLOSED_BUILD)CLOSED_MISC_KMODS += amsrc1 $(CLOSED_BUILD)CLOSED_MISC_KMODS += klmmod klmops @@ -550,11 +577,6 @@ IPP_KMODS += tokenmt IPP_KMODS += tswtclmt # -# 'Dacf' modules (/kernel/dacf) -# -DACF_KMODS += consconfig_dacf - -# # generic-unix module (/kernel/genunix): # GENUNIX_KMODS += genunix @@ -580,6 +602,7 @@ $(CLOSED_BUILD)CLOSED_XMODS = \ lsimega \ nge \ sdpib \ + spwr \ tavor |