Revert change of extension ID
Update device to macro map with the latest devices known to the GNU toolchain