Merge pull request #1061 from robertovargas-arm/norflash

nor-flash