ARM: Merge next-simtec