Merge pull request #1197 from dp-arm/dp/amu

AMUv1 support