Hi Sami, Yes this is a mistake, modifications to ScmiMessageIdBasexxx should actually be part of 'ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_BASE' Regards, Pierre