Merge branch 'hpe/gxp-soc' into arm/late