Hi Payton For BaseSerialPortLibHob.inf please use BaseSerialPortLibHob.c For DxeSerialPortLibHob.inf please use BaseSerialPortLibHob.c and DxeSerialPortLibHob.c and remove redundant code. Have any limitation, please share for us. Thanks, Gua From: devel@edk2.groups.io On Behalf Of Benjamin Doron Sent: Friday, April 28, 2023 1:36 AM To: Hsieh, PaytonX ; devel@edk2.groups.io Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix issues when MULTIPLE_DEBUG_PORT_SUPPORT is true Hi, Can you deduplicate this code by moving the functions into a common, or "base" file, and DXE's constructor and event into a separate file? As I see it, it should be alright to reuse DXE's functions for other phases, the `mBaseSerialPortLibHobAtRuntime` variable will never be changed in this case. Regards, Benjamin