diff options
| author | Kinney, Michael D <michael.d.kinney@intel.com> | 2018-08-02 14:22:23 -0700 |
|---|---|---|
| committer | Kinney, Michael D <michael.d.kinney@intel.com> | 2018-08-02 18:42:27 -0700 |
| commit | 83964ebc5e74549d6efc7134af19150a0b2079aa (patch) | |
| tree | fd0218b857afb8290239e75bf5c1bd109a9776e7 | |
| parent | 7191827f90b4a09cfef56e1cf23a768a9cb90e07 (diff) | |
| download | edk2-83964ebc5e74549d6efc7134af19150a0b2079aa.tar.gz edk2-83964ebc5e74549d6efc7134af19150a0b2079aa.tar.bz2 edk2-83964ebc5e74549d6efc7134af19150a0b2079aa.zip | |
BaseTools/BinToPcd: Encode string returned from ByteArray()
https://bugzilla.tianocore.org/show_bug.cgi?id=1069
The ByteArray() method returns a string with the hex bytes of
a PCD value. Make sure the string is always encoded as a string,
so it can be used to build a complete PCD statement string and be
written out to a file. This change is required for Python 3.x
compatibility.
Cc: YanYan Sun <yanyan.sun@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
| -rw-r--r-- | BaseTools/Scripts/BinToPcd.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 25b74f6004..1495a36933 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -70,7 +70,8 @@ if __name__ == '__main__': #
# Return a PCD value of the form '{0x01, 0x02, ...}' along with the PCD length in bytes
#
- return '{' + (', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer])) + '}', len (Buffer)
+ PcdValue = '{' + ', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer]) + '}'
+ return PcdValue.encode (), len (Buffer)
#
# Create command line argument parser object
|