remedy prior merge failure.  also get refactored portalalloc driver to build for zynq platform