From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 13 Apr 2009 17:47:21 +0000 (+0000)
Subject: [MTHCA] Remove hard-coded KMDF version numbers; use $(KMDF_VERSION_MAJOR).$(KMDF_VERS... 
X-Git-Url: http://git.etherboot.org/mirror/winof/.git/commitdiff_plain/8bbe15229375e5b8ea9ed8e2ea3d8ca6ac51bc56?hp=1d6aefff31c0f913a802d3e7027450c79039d8cf

[MTHCA] Remove hard-coded KMDF version numbers; use $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) instead.
Remove DDK build env test.

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2095 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/hw/mthca/kernel/SOURCES b/hw/mthca/kernel/SOURCES
index 5364cdbc..f653d228 100644
--- a/hw/mthca/kernel/SOURCES
+++ b/hw/mthca/kernel/SOURCES
@@ -4,13 +4,13 @@ TARGETNAME=mthca
 TARGETPATH=$(TRUNK)\bin\kernel\obj$(BUILD_ALT_DIR)
 TARGETTYPE=DRIVER
 
-!if $(_NT_TOOLS_VERSION) != 0x700
+KMDF_VERSION_MAJOR=1
+
 # WDK build only - transform .inx --> .inf adding date & version stamp.
 # see .\makefile.inc
 INF_NAME=$(TARGETNAME)
 INF_TARGET=$(TRUNK)\bin\kernel\$(O)\$(INF_NAME).inf
 NTTARGETFILES=$(INF_TARGET)
-!endif
 
 !if $(FREEBUILD)
 ENABLE_EVENT_TRACING=1
diff --git a/hw/mthca/kernel/makefile.inc b/hw/mthca/kernel/makefile.inc
index 4f29f500..3f3c0013 100644
--- a/hw/mthca/kernel/makefile.inc
+++ b/hw/mthca/kernel/makefile.inc
@@ -8,7 +8,7 @@ _LNG=$(LANGUAGE)
 _INX=.
 !ENDIF
 
-STAMP=stampinf -a $(_BUILDARCH)
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)
 
 !INCLUDE mod_ver.def
 
diff --git a/hw/mthca/kernel/mthca.inx b/hw/mthca/kernel/mthca.inx
index bac2dd3d..90862f09 100644
--- a/hw/mthca/kernel/mthca.inx
+++ b/hw/mthca/kernel/mthca.inx
@@ -65,7 +65,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,
 winmad.dll = 1,,
 winmadd.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 
 [SourceDisksFiles.amd64]
@@ -89,7 +89,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,
 winmad.dll = 1,,
 winmadd.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 [SourceDisksFiles.ia64]
 mthca.sys=1,,
@@ -112,7 +112,7 @@ winverbsd.dll = 1,,
 winmad.sys = 1,,
 winmad.dll = 1,,
 winmadd.dll = 1,,
-WdfCoInstaller01007.dll = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 [Manufacturer]
 %MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64
@@ -360,10 +360,10 @@ AddReg = Wdf_CoInstaller_AddReg
 CopyFiles = Wdf_CoInstaller_CopyFiles
 
 [Wdf_CoInstaller_AddReg]
-HKR,, CoInstallers32,0x00010000, "WdfCoInstaller01007.dll,WdfCoInstaller"
+HKR,, CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
 
 [Wdf_CoInstaller_CopyFiles]
-WdfCoInstaller01007.dll
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
 
 [MTHCA.DDInstall.ntx86.Wdf]
 KmdfService = WinVerbs, WvWdfSect