Re: [PATCH edk2-non-osi v2 1/1] Hisilicon/Sm750Dxe: Unify binary and fix GOP frame buffer base

[Guo Heyi <heyi.guo@linaro.org>]

Ah, I made the change locally but forgot to send it out...

Now it is there :)

Thanks and regards,
Heyi

On Wed, Mar 28, 2018 at 03:37:19PM +0200, Ard Biesheuvel wrote:
> On 26 March 2018 at 10:25, Heyi Guo <heyi.guo@linaro.org> wrote:
> > Sm750Dxe is a generic PCIe device driver for SM750 VGA device, so it
> > is not necessary to maintain two different binary images for D03 and
> > D05 respectively.
> >
> > The main difference between D03 and D05 is the implementation of
> > SerialPortLib, which causes BaseDebugLibSerialPort to be different. So
> > we switch to null DebugLib for release build and get a unified
> > Sm750Dxe binary.
> >
> > The code in SM750 driver treated the address returned from
> > PciIo->GetBarAttributes() as device address; this should be fixed
> > after edk2 commit dc080d3 since GetBarAttributes() returns host
> > address from then on.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> > Signed-off-by: Yi Li <phoenix.liyi@huawei.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Obviously, this requires a matching update in edk2-platforms, so
> please send that out and we can apply both at the same time.
> 
> 
> > ---
> >  Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf           |  32 --------------------
> >  Platform/Hisilicon/{D05 => }/Drivers/Sm750Dxe/UefiSmi.inf     |   0
> >  Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi | Bin 17728 -> 0 bytes
> >  Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi | Bin 18592 -> 0 bytes
> >  Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi     | Bin 0 -> 17760 bytes
> >  5 files changed, 32 deletions(-)
> >
> > diff --git a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf b/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf
> > deleted file mode 100644
> > index a2618331440f..000000000000
> > --- a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf
> > +++ /dev/null
> > @@ -1,32 +0,0 @@
> > -#/** @file
> > -#
> > -#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> > -#    Copyright (c) 2016, Linaro Limited. All rights reserved.
> > -#
> > -#    This program and the accompanying materials
> > -#    are licensed and made available under the terms and conditions of the BSD License
> > -#    which accompanies this distribution. The full text of the license may be found at
> > -#    http://opensource.org/licenses/bsd-license.php
> > -#
> > -#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> > -#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> > -#
> > -#**/
> > -
> > -
> > -[Defines]
> > -  INF_VERSION          = 0x00010005
> > -  BASE_NAME            = SmiGraphicsOutput
> > -  FILE_GUID            = BFB7B510-B09B-11DB-96E3-005056C00008
> > -  MODULE_TYPE          = UEFI_DRIVER
> > -  VERSION_STRING       = 1.0
> > -
> > -  PCI_VENDOR_ID        = 0x126F
> > -  PCI_DEVICE_ID        = 0x0750
> > -  PCI_CLASS_CODE       = 0x030000
> > -  PCI_REVISION         = 0xA1
> > -  COMPRESS             = TRUE
> > -
> > -[Binaries]
> > -  PE32|SmiGraphicsOutput.efi|*
> > -
> > diff --git a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf b/Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi.inf
> > similarity index 100%
> > rename from Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf
> > rename to Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi.inf
> > diff --git a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi
> > deleted file mode 100644
> > index 16c91e2b18ef..000000000000
> > Binary files a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi and /dev/null differ
> > diff --git a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi
> > deleted file mode 100644
> > index b8de0259c785..000000000000
> > Binary files a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi and /dev/null differ
> > diff --git a/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi
> > new file mode 100644
> > index 000000000000..3ae8ddfb647f
> > Binary files /dev/null and b/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi differ
> > --
> > 2.7.4
> >