[edk2,edk2-platforms,v1,12/16] Hisilicon/D06: Use new flash layout

Message ID 20190201133436.10500-13-ming.huang@linaro.org
State Superseded
Headers show
Series
  • Fix issues and improve D0x
Related show

Commit Message

Ming Huang Feb. 1, 2019, 1:34 p.m.
In new flash layout, BIOS fd change from offset 1M to 8M in 16M
spi flash. Use the new CustomData.Fv which indicate the offset
of fd and which flash area can be updated for BMC.

This patch is relative with patch "Use new flash layout" in
edk2-non-osi.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <ming.huang@linaro.org>

---
 Platform/Hisilicon/D06/D06.fdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.9.5

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm Feb. 11, 2019, 2:54 p.m. | #1
On Fri, Feb 01, 2019 at 09:34:32PM +0800, Ming Huang wrote:
> In new flash layout, BIOS fd change from offset 1M to 8M in 16M

> spi flash.


This bit

> Use the new CustomData.Fv which indicate the offset

> of fd and which flash area can be updated for BMC.


is of critical importance. Should be its own paragraph.

How does this change affect variable storage? Will the server maintain
state after a firmware upgrade, or will the operator need to rescue it
manually via the BMC?

/
    Leif

> 

> This patch is relative with patch "Use new flash layout" in

> edk2-non-osi.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ming Huang <ming.huang@linaro.org>

> ---

>  Platform/Hisilicon/D06/D06.fdf | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf

> index d495ad7f264c..f72b513352fb 100644

> --- a/Platform/Hisilicon/D06/D06.fdf

> +++ b/Platform/Hisilicon/D06/D06.fdf

> @@ -29,7 +29,7 @@ [DEFINES]

>  ################################################################################

>  [FD.D06]

>  

> -BaseAddress   = 0x204100000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.

> +BaseAddress   = 0x204800000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.

>  

>  Size          = 0x00400000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device

>  ErasePolarity = 1

> @@ -124,7 +124,7 @@ [FD.D06]

>  0x003E0000|0x00010000

>  

>  0x003F0000|0x00010000

> -FILE = Platform/Hisilicon/D0x-CustomData.Fv

> +FILE = Platform/Hisilicon/D06/CustomData.Fv

>  

>  ################################################################################

>  #

> -- 

> 2.9.5

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ming Huang Feb. 13, 2019, 4:43 a.m. | #2
On 2/11/2019 10:54 PM, Leif Lindholm wrote:
> On Fri, Feb 01, 2019 at 09:34:32PM +0800, Ming Huang wrote:

>> In new flash layout, BIOS fd change from offset 1M to 8M in 16M

>> spi flash.

> 

> This bit

> 

>> Use the new CustomData.Fv which indicate the offset

>> of fd and which flash area can be updated for BMC.

> 

> is of critical importance. Should be its own paragraph.

> 

> How does this change affect variable storage? Will the server maintain

> state after a firmware upgrade, or will the operator need to rescue it

> manually via the BMC?


As the address of variable is change, need to update via the BMC for 19.02.

Thanks

> 

> /

>     Leif

> 

>>

>> This patch is relative with patch "Use new flash layout" in

>> edk2-non-osi.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.1

>> Signed-off-by: Ming Huang <ming.huang@linaro.org>

>> ---

>>  Platform/Hisilicon/D06/D06.fdf | 4 ++--

>>  1 file changed, 2 insertions(+), 2 deletions(-)

>>

>> diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf

>> index d495ad7f264c..f72b513352fb 100644

>> --- a/Platform/Hisilicon/D06/D06.fdf

>> +++ b/Platform/Hisilicon/D06/D06.fdf

>> @@ -29,7 +29,7 @@ [DEFINES]

>>  ################################################################################

>>  [FD.D06]

>>  

>> -BaseAddress   = 0x204100000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.

>> +BaseAddress   = 0x204800000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.

>>  

>>  Size          = 0x00400000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device

>>  ErasePolarity = 1

>> @@ -124,7 +124,7 @@ [FD.D06]

>>  0x003E0000|0x00010000

>>  

>>  0x003F0000|0x00010000

>> -FILE = Platform/Hisilicon/D0x-CustomData.Fv

>> +FILE = Platform/Hisilicon/D06/CustomData.Fv

>>  

>>  ################################################################################

>>  #

>> -- 

>> 2.9.5

>>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index d495ad7f264c..f72b513352fb 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -29,7 +29,7 @@  [DEFINES]
 ################################################################################
 [FD.D06]
 
-BaseAddress   = 0x204100000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
+BaseAddress   = 0x204800000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
 
 Size          = 0x00400000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
 ErasePolarity = 1
@@ -124,7 +124,7 @@  [FD.D06]
 0x003E0000|0x00010000
 
 0x003F0000|0x00010000
-FILE = Platform/Hisilicon/D0x-CustomData.Fv
+FILE = Platform/Hisilicon/D06/CustomData.Fv
 
 ################################################################################
 #