diff --git a/lib/uuid.c b/lib/uuid.c
index 7565877..6abbcf2 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -67,8 +67,11 @@
 	efi_guid_t guid;
 } list_guid[] = {
 #ifndef USE_HOSTCC
+#if defined(CONFIG_PARTITION_TYPE_GUID) || defined(CONFIG_CMD_EFIDEBUG) || \
+	defined(CONFIG_EFI)
+	{"EFI System Partition", PARTITION_SYSTEM_GUID},
+#endif
 #ifdef CONFIG_PARTITION_TYPE_GUID
-	{"system",	PARTITION_SYSTEM_GUID},
 	{"mbr",		LEGACY_MBR_PARTITION_GUID},
 	{"msft",	PARTITION_MSFT_RESERVED_GUID},
 	{"data",	PARTITION_BASIC_DATA_GUID},
@@ -182,10 +185,6 @@
 	{
 		"TCG2",
 		EFI_TCG2_PROTOCOL_GUID,
-		},
-	{
-		"System Partition",
-		PARTITION_SYSTEM_GUID
 	},
 	{
 		"Firmware Management",