Merge branch 'ofed_1_2'

Conflicts:

	Makefile

diff --cc Makefile
index b7ed1ec3e534c63c307ab31bcfbf3b87e40bb310,8be8fbe391ad12d90a8b19282915af7335349f20..889c97a659e308a4e972ee6b89aed073b5600a69
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -22,14 -22,11 +22,14 @@@ default: EXTRA_LOADLIBES="$(shell $(CXX
  default: LD=$(CC)
  static: CFLAGS+=-static
  
 -mstflint: mstflint.o
 -      $(LD) ${LDFLAGS} ${CFLAGS} ${CXXFLAGS} mstflint.o -o mstflint ${LOADLIBES}
 +mstflint: mstflint.o mflash.o
 +      $(LD) ${LDFLAGS} ${CFLAGS} ${CXXFLAGS} mstflint.o mflash.o -o mstflint ${LOADLIBES}
  
 -mstflint.o: flint.cpp mtcr.h
 -      $(CXX) ${CFLAGS} ${CXXFLAGS} -c  flint.cpp -o mstflint.o
 +mstflint.o: flint.cpp mflash.h
-       $(CXX) ${CFLAGS} -c flint.cpp -o mstflint.o
++      $(CXX) ${CFLAGS} ${CXXFLAGS} -c flint.cpp -o mstflint.o
 +
 +mflash.o: mtcr.h mflash.c mflash.h
 +      $(CC) ${CFLAGS} -c mflash.c -o mflash.o
  
  mstmwrite: mwrite.c mtcr.h
        $(CC) ${CFLAGS} mwrite.c -o mstmwrite

diff --cc README
index 84ed33bfc61f8108779270ed089e007844052c26,406668ea55656d0da0b6d80e48ba1d04a72df300..fac5ad4885b8b8c143a24636900477b30000f6fe
--- 1/README
--- 2/README
+++ b/README
@@@ -18,12 -19,14 +19,16 @@@ mstflint: A BURNING FIRMWARE APPLICATIO
      
  2) Package Contents
      a) mstflint source code.
 -    b) mtcr linux utility.
 -       This utility enables the mstflint burning utility to access the HCA
 +    b) mflash lib.
 +       This lib provides flash access through Mellanox HCAs.
 +    c) mtcr linux utility.
 +       This utility enables the mflash lib to access the HCA
         hardware registers.
- 
+     c) mstregdump utility
+        This utility dumps hardware registers from Mellanox hardware,
+        for later analysis by Mellanox
+     d) mstvpd
+        This utility dumps on-card VPD
  
  3) Installation
      a) Build the the mstflint utility.