Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)
Not fully happy about the way this one interacts with the various platforms. Maybe the platform_config.h should be generated by the SCsub instead of passing a define just to know where is the header.