add enrc2b support

Change-Id: I4153f75cc9be456a1961014474761f24e22378b3
add m4 support

Change-Id: I3aed71e6f1063cd60dba320845081353476265d3