[MLX4] Remove hard-coded KMDF version numbers; use $(KMDF_VERSION_MAJOR).$(KMDF_VERSI...

Remove DDK build env test.

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

diff --git a/trunk/hw/mlx4/kernel/bus/drv/makefile.inc b/trunk/hw/mlx4/kernel/bus/drv/makefile.inc
index f2e12253d1eca10a6ae21348164b4d072f81201c..b23286df69328f5fc166dcf761d72b9d624f5ae7 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/drv/makefile.inc
+++ b/trunk/hw/mlx4/kernel/bus/drv/makefile.inc
@@ -14,7 +14,7 @@ _LNG=$(LANGUAGE)
 _INX=.\r
 !ENDIF\r
 \r
-STAMP=stampinf -a $(_BUILDARCH)\r
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)\r
 \r
 !INCLUDE mod_ver.def\r
 \r

diff --git a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
index 042991a96b1e62695d9a83af61320163dadeba57..4cfcb3554c8fa5319127f7c736c62356dd168cbd 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
+++ b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
@@ -48,15 +48,15 @@ HKR,,SilentInstall,,1
 \r
 [SourceDisksFiles.x86]\r
 mlx4_bus.sys = 1,,\r
-wdfcoinstaller01007.dll = 1,,\r
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 [SourceDisksFiles.amd64]\r
 mlx4_bus.sys = 1,,\r
-wdfcoinstaller01007.dll = 1,,\r
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 [SourceDisksFiles.ia64]\r
 mlx4_bus.sys = 1,,\r
-wdfcoinstaller01007.dll = 1,,\r
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 \r
 ;*****************************************\r
 ; Mlx4Bus  Install Section\r
@@ -226,10 +226,10 @@ AddReg=Wdf_CoInstaller_AddReg
 CopyFiles=Wdf_CoInstaller_CopyFiles\r
 \r
 [Wdf_CoInstaller_AddReg]\r
-HKR,,CoInstallers32,0x00010000, "wdfcoinstaller01007.dll,WdfCoInstaller"\r
+HKR,,CoInstallers32,0x00010000, "wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"\r
 \r
 [Wdf_CoInstaller_CopyFiles]\r
-wdfcoinstaller01007.dll\r
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll\r
 \r
 [MLX4BUS.DDInstall.ntx86.Wdf]\r
 KmdfService = mlx4_bus, mlx4_bus_wdfsect\r
@@ -241,7 +241,7 @@ KmdfService = mlx4_bus, mlx4_bus_wdfsect
 KmdfService = mlx4_bus, mlx4_bus_wdfsect\r
 \r
 [mlx4_bus_wdfsect]\r
-KmdfLibraryVersion = 1.7\r
+KmdfLibraryVersion = $KMDFVERSION$\r
 \r
 \r
 ;*****************************************\r

diff --git a/trunk/hw/mlx4/kernel/bus/drv/sources b/trunk/hw/mlx4/kernel/bus/drv/sources
index 00644b69b896746c87db8cd698f76aa0a2439d57..c8eb3b0a05ed8af2db60d98333a0ab0335bed3f6 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/drv/sources
+++ b/trunk/hw/mlx4/kernel/bus/drv/sources
@@ -2,13 +2,11 @@ TARGETNAME=mlx4_bus
 TARGETPATH=..\..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER\r
 \r
-!if $(_NT_TOOLS_VERSION) != 0x700\r
 # WDK build only - transform .inx --> .inf adding date & version stamp.\r
 # see .\makefile.inc\r
 INF_NAME=$(TARGETNAME)\r
 INF_TARGET=..\..\..\..\..\bin\kernel\$(O)\$(INF_NAME).inf\r
 NTTARGETFILES=$(INF_TARGET)\r
-!endif\r
 \r
 !if $(FREEBUILD)\r
 ENABLE_EVENT_TRACING=1\r
@@ -27,9 +25,7 @@ PRECOMPILED_INCLUDE=precomp.h
 \r
 NTTARGETFILE0=mofcomp\r
 \r
-KMDF_VERSION=1\r
-\r
-KMDF_MINOR_VERSION=7\r
+KMDF_VERSION_MAJOR=1\r
 \r
 C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__LITTLE_ENDIAN -DUSE_WDM_INTERRUPTS\r
 \r

diff --git a/trunk/hw/mlx4/kernel/hca/SOURCES b/trunk/hw/mlx4/kernel/hca/SOURCES
index cb3caf72589bae73bca605968e46750e502484d6..f497a4888853bb6c73e7090d275506a4db07fda3 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/SOURCES
+++ b/trunk/hw/mlx4/kernel/hca/SOURCES
@@ -2,13 +2,11 @@ TARGETNAME=mlx4_hca
 TARGETPATH=..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER\r
 \r
-!if $(_NT_TOOLS_VERSION) != 0x700\r
 # WDK build only - transform .inx --> .inf adding date & version stamp.\r
 # see .\makefile.inc\r
 INF_NAME=$(TARGETNAME)\r
 INF_TARGET=..\..\..\..\bin\kernel\$(O)\$(INF_NAME).inf\r
 NTTARGETFILES=$(INF_TARGET)\r
-!endif\r
 \r
 !if $(FREEBUILD)\r
 ENABLE_EVENT_TRACING=1\r
@@ -40,7 +38,7 @@ PRECOMPILED_INCLUDE=precomp.h
 \r
 NTTARGETFILE0=mofcomp\r
 \r
-KMDF_VERSION=1\r
+KMDF_VERSION_MAJOR=1\r
 \r
 C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__LITTLE_ENDIAN \r
 #-DUSE_WDM_FRAMEWORK \r

diff --git a/trunk/hw/mlx4/kernel/hca/makefile.inc b/trunk/hw/mlx4/kernel/hca/makefile.inc
index b926e9590bbc5961fcf06c95bdad96c9afe78269..bdf9eb237b11e00f2561fca86e309b4b7fdfd59a 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/makefile.inc
+++ b/trunk/hw/mlx4/kernel/hca/makefile.inc
@@ -14,7 +14,7 @@ _LNG=$(LANGUAGE)
 _INX=.\r
 !ENDIF\r
 \r
-STAMP=stampinf -a $(_BUILDARCH)\r
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)\r
 \r
 !INCLUDE mod_ver.def\r
 \r

diff --git a/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx b/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
index 046a70cc634cf070b17675e6441ea0c331b4943f..35f88fa3ac3405260c6b97af5c161f55e0a8752d 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
+++ b/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx
@@ -61,7 +61,7 @@ HKR,,"UpperFilters",0x00010008,"WinMad"
 mlx4_hca.sys = 1,,\r
 mlx4u.dll = 1,,\r
 mlx4ud.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 ibal.dll=1,,\r
 ibald.dll=1,,\r
 complib.dll=1,,\r
@@ -80,7 +80,7 @@ mlx4u.dll = 1,,
 mlx4ud.dll = 1,,\r
 mlx4u32.dll = 1,,\r
 mlx4u32d.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 ibal.dll=1,,\r
 ibald.dll=1,,\r
 complib.dll=1,,\r
@@ -103,7 +103,7 @@ mlx4u.dll = 1,,
 mlx4ud.dll = 1,,\r
 mlx4u32.dll = 1,,\r
 mlx4u32d.dll = 1,,\r
-WdfCoInstaller01007.dll = 1,,\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,\r
 ibal.dll=1,,\r
 ibald.dll=1,,\r
 complib.dll=1,,\r
@@ -408,10 +408,10 @@ AddReg=Wdf_CoInstaller_AddReg
 CopyFiles=Wdf_CoInstaller_CopyFiles\r
 \r
 [Wdf_CoInstaller_AddReg]\r
-HKR,,CoInstallers32,0x00010000, "WdfCoInstaller01007.dll,WdfCoInstaller"\r
+HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"\r
 \r
 [Wdf_CoInstaller_CopyFiles]\r
-WdfCoInstaller01007.dll\r
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll\r
 \r
 [MLX4HCA.DDInstall.ntx86.Wdf]\r
 KmdfService = mlx4_hca,WvWdfSect\r
@@ -429,7 +429,7 @@ KmdfService = WinVerbs,WvWdfSect
 KmdfService = WinMad,WvWdfSect\r
 \r
 [WvWdfSect]\r
-KmdfLibraryVersion = 1.7\r
+KmdfLibraryVersion = $KMDFVERSION$\r
 \r
 \r
 ;*****************************************\r