diff --git a/meta-ohos-staging/recipes-core/ovmf/files/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch b/meta-ohos-staging/recipes-core/ovmf/files/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch
new file mode 100644
index 0000000000000000000000000000000000000000..79f50711fc6d161a79645dc424cb9fe81ae34074
--- /dev/null
+++ b/meta-ohos-staging/recipes-core/ovmf/files/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch
@@ -0,0 +1,52 @@
+From 5d8648345cd9ad729837118c731063c59edea192 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 12 Aug 2020 01:28:17 +0800
+Subject: [PATCH 1/1] BaseTools: fix ucs-2 lookup on python 3.9
+
+python3.9 changed/fixed codec.register behavior to always replace
+hyphen with underscore for passed in codec names:
+
+ https://bugs.python.org/issue37751
+
+So the custom Ucs2Search needs to be adapted to handle 'ucs_2' in
+addition to existing 'ucs-2' for back compat.
+
+This fixes test failures on python3.9, example:
+
+======================================================================
+FAIL: testUtf16InUniFile (CheckUnicodeSourceFiles.Tests)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 375, in PreProcess
+ FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))
+ File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 303, in OpenUniFile
+ UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)
+ File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 312, in VerifyUcs2Data
+ Ucs2Info = codecs.lookup('ucs-2')
+LookupError: unknown encoding: ucs-2
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
+Reviewed-by: Bob Feng <bob.c.feng@intel.com>
+
+Upstream-Status: Backport
+---
+ BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+index b2895f7e5c..883c2356e0 100644
+--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
++++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+@@ -152,7 +152,7 @@ class Ucs2Codec(codecs.Codec):
+
+ TheUcs2Codec = Ucs2Codec()
+ def Ucs2Search(name):
+- if name == 'ucs-2':
++ if name in ['ucs-2', 'ucs_2']:
+ return codecs.CodecInfo(
+ name=name,
+ encode=TheUcs2Codec.encode,
+--
+2.31.1
+
diff --git a/meta-ohos-staging/recipes-core/ovmf/files/0002-BaseTools-Work-around-array.array.tostring-removal-i.patch b/meta-ohos-staging/recipes-core/ovmf/files/0002-BaseTools-Work-around-array.array.tostring-removal-i.patch
new file mode 100644
index 0000000000000000000000000000000000000000..780dcf40aabebdc0861b9a9d0e83eeee6beefff3
--- /dev/null
+++ b/meta-ohos-staging/recipes-core/ovmf/files/0002-BaseTools-Work-around-array.array.tostring-removal-i.patch
@@ -0,0 +1,52 @@
+From 43bec9ea3d56f3662ede78023baa2a791b66acac Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 12 Aug 2020 01:28:18 +0800
+Subject: [PATCH 1/1] BaseTools: Work around array.array.tostring() removal in
+ python 3.9
+
+In python3, array.array.tostring() was a compat alias for tobytes().
+tostring() was removed in python 3.9.
+
+Convert this to use tolist() which should be valid for all python
+versions.
+
+This fixes this build error on python3.9:
+
+(Python 3.9.0b5 on linux) Traceback (most recent call last):
+ File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 593, in Main
+ GenerateVfrBinSec(CommandOptions.ModuleName, CommandOptions.DebugDir, CommandOptions.OutputFile)
+ File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 449, in GenerateVfrBinSec
+ VfrUniOffsetList = GetVariableOffset(MapFileName, EfiFileName, VfrNameList)
+ File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 88, in GetVariableOffset
+ return _parseForGCC(lines, efifilepath, varnames)
+ File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 151, in _parseForGCC
+ efisecs = PeImageClass(efifilepath).SectionHeaderList
+ File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 1638, in __init__
+ if ByteArray.tostring() != b'PE\0\0':
+AttributeError: 'array.array' object has no attribute 'tostring'
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
+Reviewed-by: Bob Feng <bob.c.feng@intel.com>
+
+Upstream-Status: Backport
+---
+ BaseTools/Source/Python/Common/Misc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
+index ad55671080..4be7957138 100755
+--- a/BaseTools/Source/Python/Common/Misc.py
++++ b/BaseTools/Source/Python/Common/Misc.py
+@@ -1635,7 +1635,7 @@ class PeImageClass():
+ ByteArray = array.array('B')
+ ByteArray.fromfile(PeObject, 4)
+ # PE signature should be 'PE\0\0'
+- if ByteArray.tostring() != b'PE\0\0':
++ if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]:
+ self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
+ return
+
+--
+2.31.1
+
diff --git a/meta-ohos-staging/recipes-core/ovmf/ovmf_%.bbappend b/meta-ohos-staging/recipes-core/ovmf/ovmf_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..b7e59774daca5e33f828dea42cc5764b3c9db2da
--- /dev/null
+++ b/meta-ohos-staging/recipes-core/ovmf/ovmf_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = "\
+ file://0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch \
+ file://0002-BaseTools-Work-around-array.array.tostring-removal-i.patch \
+ "