Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform