aboutsummaryrefslogtreecommitdiffstats
path: root/plat/mediatek
diff options
context:
space:
mode:
authorRoberto Vargas <roberto.vargas@arm.com>2018-04-26 13:36:53 +0100
committerRoberto Vargas <roberto.vargas@arm.com>2018-06-14 14:41:00 +0100
commit033648652f2d66abe2454a75ded891a47cb13446 (patch)
tree44f1cf0dbdc9601e539393015091c59027de8be3 /plat/mediatek
parent74a44dca29be3e780ea50cf7a595883a399e7cfb (diff)
downloadplatform_external_arm-trusted-firmware-033648652f2d66abe2454a75ded891a47cb13446.tar.gz
platform_external_arm-trusted-firmware-033648652f2d66abe2454a75ded891a47cb13446.tar.bz2
platform_external_arm-trusted-firmware-033648652f2d66abe2454a75ded891a47cb13446.zip
Make TF UUID RFC 4122 compliant
RFC4122 defines that fields are stored in network order (big endian), but TF-A stores them in machine order (little endian by default in TF-A). We cannot change the future UUIDs that are already generated, but we can store all the bytes using arrays and modify fiptool to generate the UUIDs with the correct byte order. Change-Id: I97be2d3168d91f4dee7ccfafc533ea55ff33e46f Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
Diffstat (limited to 'plat/mediatek')
-rw-r--r--plat/mediatek/common/custom/oem_svc.c7
-rw-r--r--plat/mediatek/common/mtk_sip_svc.c6
2 files changed, 6 insertions, 7 deletions
diff --git a/plat/mediatek/common/custom/oem_svc.c b/plat/mediatek/common/custom/oem_svc.c
index c396e2d99..18bda515a 100644
--- a/plat/mediatek/common/custom/oem_svc.c
+++ b/plat/mediatek/common/custom/oem_svc.c
@@ -14,10 +14,9 @@
#include <uuid.h>
/* OEM Service UUID */
-DEFINE_SVC_UUID(oem_svc_uid,
- 0xb943add0, 0x069d, 0x11e4, 0x91, 0x91,
- 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66);
-
+DEFINE_SVC_UUID2(oem_svc_uid,
+ 0xd0ad43b9, 0x9b06, 0xe411, 0x91, 0x91,
+ 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66);
/* Setup OEM Services */
static int32_t oem_svc_setup(void)
diff --git a/plat/mediatek/common/mtk_sip_svc.c b/plat/mediatek/common/mtk_sip_svc.c
index ea8cea007..71eddca31 100644
--- a/plat/mediatek/common/mtk_sip_svc.c
+++ b/plat/mediatek/common/mtk_sip_svc.c
@@ -14,9 +14,9 @@
#include <uuid.h>
/* Mediatek SiP Service UUID */
-DEFINE_SVC_UUID(mtk_sip_svc_uid,
- 0xf7582ba4, 0x4262, 0x4d7d, 0x80, 0xe5,
- 0x8f, 0x95, 0x05, 0x00, 0x0f, 0x3d);
+DEFINE_SVC_UUID2(mtk_sip_svc_uid,
+ 0xa42b58f7, 0x6242, 0x7d4d, 0x80, 0xe5,
+ 0x8f, 0x95, 0x05, 0x00, 0x0f, 0x3d);
#pragma weak mediatek_plat_sip_handler
uintptr_t mediatek_plat_sip_handler(uint32_t smc_fid,