BaseTools/BinToPcd: Encode string returned from ByteArray()

[mirror_edk2.git] / BaseTools / Scripts / BinToPcd.py

diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py
index c42e37bd119b5881018b9e2230a8df29b803de16..1495a36933c4ce5516aeb6bd48f4e8465da20fc3 100644 (file)
--- a/BaseTools/Scripts/BinToPcd.py
+++ b/BaseTools/Scripts/BinToPcd.py
@@ -66,11 +66,12 @@ if __name__ == '__main__':
             #\r
             # If Xdr flag is not set, then concatenate all the data\r
             #\r
-            Buffer = b''.join (Buffer)\r
+            Buffer = bytearray (b''.join (Buffer))\r
         #\r
         # Return a PCD value of the form '{0x01, 0x02, ...}' along with the PCD length in bytes\r
         #\r
-        return '{' + (', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer])) + '}', len (Buffer)\r
+        PcdValue = '{' + ', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer]) + '}'\r
+        return PcdValue.encode (), len (Buffer)\r
 \r
     #\r
     # Create command line argument parser object\r