[Linaro-uefi,01/28] Platforms/D02: Update binaries

Message ID 1479122995-50330-2-git-send-email-heyi.guo@linaro.org
State New
Headers show

Commit Message

gary guo Nov. 14, 2016, 11:29 a.m.
Update D02 binaries and fdf file to fix below issues:

1. Enlarge FVMAIN_COMPACT
The original size of FVMAIN_COMPACT is not enough for clang DEBUG
version, so we enlarge FVMAIN_COMPACT and move variable store and
Trusted Firmware binaries accordingly.

2. Update memory init code to improve robustness
3. Update ebl.efi to solve can not get IP address through DHCP
4. Update Trusted Firmware
5. Update FVMAIN_SEC.fv to coordinate directories changes
6. Update related binaries for structure and function definition changes.
7. Update ATF binaries to fix a bug in ATF code.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
---
 .../Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib   | Bin 439708 -> 431524 bytes
 Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi         | Bin 159744 -> 137056 bytes
 .../Binary/D02/MemoryInitPei/MemoryInit.efi        | Bin 159136 -> 160672 bytes
 Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv   | Bin 262144 -> 262144 bytes
 Platforms/Hisilicon/Binary/D02/bl1.bin             | Bin 14344 -> 12296 bytes
 Platforms/Hisilicon/Binary/D02/fip.bin             | Bin 45621 -> 45621 bytes
 Platforms/Hisilicon/D02/Pv660D02.fdf               |  22 ++++++++++-----------
 7 files changed, 11 insertions(+), 11 deletions(-)

Comments

Leif Lindholm Nov. 15, 2016, 2:20 p.m. | #1
On Mon, Nov 14, 2016 at 07:29:28PM +0800, Heyi Guo wrote:
> Update D02 binaries and fdf file to fix below issues:
> 
> 1. Enlarge FVMAIN_COMPACT
> The original size of FVMAIN_COMPACT is not enough for clang DEBUG
> version, so we enlarge FVMAIN_COMPACT and move variable store and
> Trusted Firmware binaries accordingly.

This is a logically seperate fix from the rest, so please break this
out into a separate commit.

I can take the remaining ones as a set this once, but in future please
provide them as separate updates for each binary blob. Bunching them
all together makes debugging more difficult.

> 2. Update memory init code to improve robustness

How does it improve robustness? What situation will this version deal
with that the previous one did not?

> 3. Update ebl.efi to solve can not get IP address through DHCP
> 4. Update Trusted Firmware
> 5. Update FVMAIN_SEC.fv to coordinate directories changes

I don't see this change.

> 6. Update related binaries for structure and function definition changes.
> 7. Update ATF binaries to fix a bug in ATF code.

Which bug is fixed?

Regards,

Leif

> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> ---
>  .../Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib   | Bin 439708 -> 431524 bytes
>  Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi         | Bin 159744 -> 137056 bytes
>  .../Binary/D02/MemoryInitPei/MemoryInit.efi        | Bin 159136 -> 160672 bytes
>  Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv   | Bin 262144 -> 262144 bytes
>  Platforms/Hisilicon/Binary/D02/bl1.bin             | Bin 14344 -> 12296 bytes
>  Platforms/Hisilicon/Binary/D02/fip.bin             | Bin 45621 -> 45621 bytes
>  Platforms/Hisilicon/D02/Pv660D02.fdf               |  22 ++++++++++-----------
>  7 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib b/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib
> index 6e9c41d..5f8ab73 100644
> Binary files a/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib and b/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib differ
> diff --git a/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi b/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi
> index 7458733..deb416c 100644
> Binary files a/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi and b/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi differ
> diff --git a/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi b/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi
> index ce63a5c..8d2a9f3 100644
> Binary files a/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi and b/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi differ
> diff --git a/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv b/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv
> index bac8767..0fc45cc 100644
> Binary files a/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv and b/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv differ
> diff --git a/Platforms/Hisilicon/Binary/D02/bl1.bin b/Platforms/Hisilicon/Binary/D02/bl1.bin
> index f11a0a0..d64bfd8 100644
> Binary files a/Platforms/Hisilicon/Binary/D02/bl1.bin and b/Platforms/Hisilicon/Binary/D02/bl1.bin differ
> diff --git a/Platforms/Hisilicon/Binary/D02/fip.bin b/Platforms/Hisilicon/Binary/D02/fip.bin
> index d8f85d0..7cdd9db 100644
> Binary files a/Platforms/Hisilicon/Binary/D02/fip.bin and b/Platforms/Hisilicon/Binary/D02/fip.bin differ
> diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf
> index fa0dc2d..ec4d749 100644
> --- a/Platforms/Hisilicon/D02/Pv660D02.fdf
> +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf
> @@ -58,11 +58,18 @@ NumBlocks     = 0x30
>  gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
>  FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv
>  
> -0x00040000|0x00190000
> +0x00040000|0x00240000
>  gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
>  FV = FVMAIN_COMPACT
>  
> -0x001e0000|0x0000e000
> +## Place for Trusted Firmware
> +0x00280000|0x00020000
> +gHisiTokenSpaceGuid.PcdTrustedFirmwareBL1Base
> +FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/bl1.bin
> +0x002a0000|0x00020000
> +FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/fip.bin
> +
> +0x002e0000|0x0000e000
>  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
>  DATA = {
>    ## This is the EFI_FIRMWARE_VOLUME_HEADER
> @@ -90,7 +97,7 @@ DATA = {
>    0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
>  }
>  
> -0x001ee000|0x00002000
> +0x002ee000|0x00002000
>  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
>  #NV_FTW_WORKING
>  DATA = {
> @@ -103,16 +110,9 @@ DATA = {
>    0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
>  }
>  
> -0x001f0000|0x00010000
> +0x002f0000|0x00010000
>  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
>  
> -## Place for Trusted Firmware
> -0x00200000|0x00020000
> -gHisiTokenSpaceGuid.PcdTrustedFirmwareBL1Base
> -FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/bl1.bin
> -0x00220000|0x000e0000
> -FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/fip.bin
> -
>  ################################################################################
>  #
>  # FV Section
> -- 
> 1.9.1
>

Patch

diff --git a/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib b/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib
index 6e9c41d..5f8ab73 100644
Binary files a/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib and b/Chips/Hisilicon/Binary/Pv660/Library/Pv660Serdes/Pv660SerdesLib.lib differ
diff --git a/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi b/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi
index 7458733..deb416c 100644
Binary files a/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi and b/Platforms/Hisilicon/Binary/D02/Ebl/Ebl.efi differ
diff --git a/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi b/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi
index ce63a5c..8d2a9f3 100644
Binary files a/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi and b/Platforms/Hisilicon/Binary/D02/MemoryInitPei/MemoryInit.efi differ
diff --git a/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv b/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv
index bac8767..0fc45cc 100644
Binary files a/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv and b/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv differ
diff --git a/Platforms/Hisilicon/Binary/D02/bl1.bin b/Platforms/Hisilicon/Binary/D02/bl1.bin
index f11a0a0..d64bfd8 100644
Binary files a/Platforms/Hisilicon/Binary/D02/bl1.bin and b/Platforms/Hisilicon/Binary/D02/bl1.bin differ
diff --git a/Platforms/Hisilicon/Binary/D02/fip.bin b/Platforms/Hisilicon/Binary/D02/fip.bin
index d8f85d0..7cdd9db 100644
Binary files a/Platforms/Hisilicon/Binary/D02/fip.bin and b/Platforms/Hisilicon/Binary/D02/fip.bin differ
diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf
index fa0dc2d..ec4d749 100644
--- a/Platforms/Hisilicon/D02/Pv660D02.fdf
+++ b/Platforms/Hisilicon/D02/Pv660D02.fdf
@@ -58,11 +58,18 @@  NumBlocks     = 0x30
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
 FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/Sec/FVMAIN_SEC.Fv
 
-0x00040000|0x00190000
+0x00040000|0x00240000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
-0x001e0000|0x0000e000
+## Place for Trusted Firmware
+0x00280000|0x00020000
+gHisiTokenSpaceGuid.PcdTrustedFirmwareBL1Base
+FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/bl1.bin
+0x002a0000|0x00020000
+FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/fip.bin
+
+0x002e0000|0x0000e000
 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
 DATA = {
   ## This is the EFI_FIRMWARE_VOLUME_HEADER
@@ -90,7 +97,7 @@  DATA = {
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x001ee000|0x00002000
+0x002ee000|0x00002000
 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
 #NV_FTW_WORKING
 DATA = {
@@ -103,16 +110,9 @@  DATA = {
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x001f0000|0x00010000
+0x002f0000|0x00010000
 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
-## Place for Trusted Firmware
-0x00200000|0x00020000
-gHisiTokenSpaceGuid.PcdTrustedFirmwareBL1Base
-FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/bl1.bin
-0x00220000|0x000e0000
-FILE = OpenPlatformPkg/Platforms/Hisilicon/Binary/D02/fip.bin
-
 ################################################################################
 #
 # FV Section