Merge x/s csr yaml with m4 conditionals

Created by: silabs-robin

This PR merges the CSR Yaml fixes that were made on 40s into the 40x CSR Yaml. The result is 1 CSR Yaml file that is common for both cores with conditionals separating the differences. PR'ing to the 40s repo as the diff is smaller here (PR to 40x would contain the previous updates in addition).