Merge branch 'xtensa-sim-params' into xtensa-fixes