Re: [PATCH RFT] ArmVirtPkg/ArmVirtXen: move from Intel to generic BDS

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

On 4 December 2017 at 15:52, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> On 4 December 2017 at 15:19, Julien Grall <julien.grall@linaro.org> wrote:
>> Hi Ard,
>>
>> On 30/11/17 20:31, Ard Biesheuvel wrote:
>>> ArmVirtXen is the only remaining consumer of ArmPlatformPkg's
>>> PlatformIntelBdsLib implementation, which is tightly coupled to the
>>> deprecated Intel BDS. So move ArmVirtXen to the generic BDS as well,
>>> allowing us to get rid of PlatformIntelBdsLib entirely.
>>
>> It was in my list of UEFI part I wanted to look next :).
>> I tested it and hit the following assert:
>>
>> ASSERT [BdsDxe] /home/julieng/works/edk2/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c(502): 0 == 4
>>
>> Looking at the ArmVirtQemu.dsc, I made the below modification.
>> When I tried the version protected by TTY_ENABLE, the ASSERT was
>> still present.
>>
>> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
>> index ae43d59901..bc76a780be 100644
>> --- a/ArmVirtPkg/ArmVirtXen.dsc
>> +++ b/ArmVirtPkg/ArmVirtXen.dsc
>> @@ -81,6 +81,10 @@
>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)
>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000
>>
>> +  ## Default Terminal Type^M
>> +  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM^M
>> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4^M
>> +^M
>>    #
>>    # ARM Virtual Architectural Timer
>>    #
>>
>> My knowledge in UEFI is still limited, so I would appreciate any
>> feedbacks here.
>>
>
> My bad.
>
> Could you please try with this applied on top?
>
> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
> index 11e073287a84..5ddcfceef9dc 100644
> --- a/ArmVirtPkg/ArmVirtXen.dsc
> +++ b/ArmVirtPkg/ArmVirtXen.dsc
> @@ -88,6 +88,13 @@ [PcdsFixedAtBuild.common]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
>    gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83,
> 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52,
> 0x68, 0xD0, 0xB4, 0xD1 }
>
> +  ## Default Terminal Type
> +  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM
> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
> +
> +  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID
> +  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91,
> 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51,
> 0xef, 0x94}
> +
>  [PcdsPatchableInModule.common]
>    #
>    # This will be overridden in the code
>
> (and don't bother with the -D TTY_TERMINAL, it will be the default anyway)


Hmm, looking again, what you tried should actually be equivalent.
Could you try a clean rebuild please? Thanks.