diff mbox series

[U-Boot,v2,01/13] x86: doc: Fix reference to EFI doc in U-Boot

Message ID 1528817785-20208-2-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit 9efeb3f4db9479c0179283c1c221725948b155fc
Delegated to: Bin Meng
Headers show
Series x86: efi: Fixes and enhancements to application and payload support | expand

Commit Message

Bin Meng June 12, 2018, 3:36 p.m. UTC
Since commit f3b5056c4e72 ("efi_loader: split README.efi into two
separate documents"), the original README.efi was renamed to
README.u-boot_on_efi, but x86 doc still refers to the old one.

This updates the x86 doc to reference both README.u-boot_on_efi and
README.uefi.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v2:
- update the x86 doc to reference also README.uefi

 doc/README.x86 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Heinrich Schuchardt June 12, 2018, 4:04 p.m. UTC | #1
On 06/12/2018 05:36 PM, Bin Meng wrote:
> Since commit f3b5056c4e72 ("efi_loader: split README.efi into two
> separate documents"), the original README.efi was renamed to
> README.u-boot_on_efi, but x86 doc still refers to the old one.
> 
> This updates the x86 doc to reference both README.u-boot_on_efi and
> README.uefi.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
> Changes in v2:
> - update the x86 doc to reference also README.uefi
> 
>  doc/README.x86 | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/doc/README.x86 b/doc/README.x86
> index 78664c3..9f657df 100644
> --- a/doc/README.x86
> +++ b/doc/README.x86
> @@ -1134,18 +1134,18 @@ the "Power" submenu from the Windows start menu.
>  EFI Support
>  -----------
>  U-Boot supports booting as a 32-bit or 64-bit EFI payload, e.g. with UEFI.
> -This is enabled with CONFIG_EFI_STUB. U-Boot can also run as an EFI
> -application, with CONFIG_EFI_APP. The CONFIG_EFI_LOADER option, where U-Booot
> -provides an EFI environment to the kernel (i.e. replaces UEFI completely but
> -provides the same EFI run-time services) is not currently supported on x86.
> +This is enabled with CONFIG_EFI_STUB to boot from both 32-bit and 64-bit
> +UEFI BIOS. U-Boot can also run as an EFI application, with CONFIG_EFI_APP.
> +The CONFIG_EFI_LOADER option, where U-Booot provides an EFI environment to
> +the kernel (i.e. replaces UEFI completely but provides the same EFI run-time
> +services) is not currently supported on x86.

Do you mean
"is not currently supported on x86 in conjunction with EFI_STUB"
or do you mean
"still has bugs on x86"?

On qemu-x86_defconfig I can start EFI applications like the
helloworld.efi and ipxe. It is only the Linux kernel that has a problem
with memory setup. That is of cause a bug that needs further attention.

Best regards

Heinrich

>  
> -See README.efi for details of EFI support in U-Boot.
> +See README.u-boot_on_efi and README.uefi for details of EFI support in U-Boot.
>  
>  64-bit Support
>  --------------
>  U-Boot supports booting a 64-bit kernel directly and is able to change to
> -64-bit mode to do so. It also supports (with CONFIG_EFI_STUB) booting from
> -both 32-bit and 64-bit UEFI. However, U-Boot itself is currently always built
> +64-bit mode to do so. However, U-Boot itself is currently always built
>  in 32-bit mode. Some access to the full memory range is provided with
>  arch_phys_memset().
>  
>
Bin Meng June 12, 2018, 11:06 p.m. UTC | #2
Hi Heinrich,

On Wed, Jun 13, 2018 at 12:04 AM, Heinrich Schuchardt
<xypron.glpk@gmx.de> wrote:
> On 06/12/2018 05:36 PM, Bin Meng wrote:
>> Since commit f3b5056c4e72 ("efi_loader: split README.efi into two
>> separate documents"), the original README.efi was renamed to
>> README.u-boot_on_efi, but x86 doc still refers to the old one.
>>
>> This updates the x86 doc to reference both README.u-boot_on_efi and
>> README.uefi.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>> Changes in v2:
>> - update the x86 doc to reference also README.uefi
>>
>>  doc/README.x86 | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/doc/README.x86 b/doc/README.x86
>> index 78664c3..9f657df 100644
>> --- a/doc/README.x86
>> +++ b/doc/README.x86
>> @@ -1134,18 +1134,18 @@ the "Power" submenu from the Windows start menu.
>>  EFI Support
>>  -----------
>>  U-Boot supports booting as a 32-bit or 64-bit EFI payload, e.g. with UEFI.
>> -This is enabled with CONFIG_EFI_STUB. U-Boot can also run as an EFI
>> -application, with CONFIG_EFI_APP. The CONFIG_EFI_LOADER option, where U-Booot
>> -provides an EFI environment to the kernel (i.e. replaces UEFI completely but
>> -provides the same EFI run-time services) is not currently supported on x86.
>> +This is enabled with CONFIG_EFI_STUB to boot from both 32-bit and 64-bit
>> +UEFI BIOS. U-Boot can also run as an EFI application, with CONFIG_EFI_APP.
>> +The CONFIG_EFI_LOADER option, where U-Booot provides an EFI environment to
>> +the kernel (i.e. replaces UEFI completely but provides the same EFI run-time
>> +services) is not currently supported on x86.
>
> Do you mean
> "is not currently supported on x86 in conjunction with EFI_STUB"
> or do you mean
> "still has bugs on x86"?
>
> On qemu-x86_defconfig I can start EFI applications like the
> helloworld.efi and ipxe. It is only the Linux kernel that has a problem
> with memory setup. That is of cause a bug that needs further attention.
>

I did not touch this when I updated the doc. I believe the doc means
CONFIG_EFI_LOADER is not currently supported. As you mentioned, there
are still some issues to work out. Maybe after you address all the
remaining issues, we can update the doc for its support :)

Regards,
Bin
Bin Meng June 14, 2018, 6:55 a.m. UTC | #3
Hi Heinrich,

On Wed, Jun 13, 2018 at 7:06 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Hi Heinrich,
>
> On Wed, Jun 13, 2018 at 12:04 AM, Heinrich Schuchardt
> <xypron.glpk@gmx.de> wrote:
>> On 06/12/2018 05:36 PM, Bin Meng wrote:
>>> Since commit f3b5056c4e72 ("efi_loader: split README.efi into two
>>> separate documents"), the original README.efi was renamed to
>>> README.u-boot_on_efi, but x86 doc still refers to the old one.
>>>
>>> This updates the x86 doc to reference both README.u-boot_on_efi and
>>> README.uefi.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> ---
>>>
>>> Changes in v2:
>>> - update the x86 doc to reference also README.uefi
>>>
>>>  doc/README.x86 | 14 +++++++-------
>>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/doc/README.x86 b/doc/README.x86
>>> index 78664c3..9f657df 100644
>>> --- a/doc/README.x86
>>> +++ b/doc/README.x86
>>> @@ -1134,18 +1134,18 @@ the "Power" submenu from the Windows start menu.
>>>  EFI Support
>>>  -----------
>>>  U-Boot supports booting as a 32-bit or 64-bit EFI payload, e.g. with UEFI.
>>> -This is enabled with CONFIG_EFI_STUB. U-Boot can also run as an EFI
>>> -application, with CONFIG_EFI_APP. The CONFIG_EFI_LOADER option, where U-Booot
>>> -provides an EFI environment to the kernel (i.e. replaces UEFI completely but
>>> -provides the same EFI run-time services) is not currently supported on x86.
>>> +This is enabled with CONFIG_EFI_STUB to boot from both 32-bit and 64-bit
>>> +UEFI BIOS. U-Boot can also run as an EFI application, with CONFIG_EFI_APP.
>>> +The CONFIG_EFI_LOADER option, where U-Booot provides an EFI environment to
>>> +the kernel (i.e. replaces UEFI completely but provides the same EFI run-time
>>> +services) is not currently supported on x86.
>>
>> Do you mean
>> "is not currently supported on x86 in conjunction with EFI_STUB"
>> or do you mean
>> "still has bugs on x86"?
>>
>> On qemu-x86_defconfig I can start EFI applications like the
>> helloworld.efi and ipxe. It is only the Linux kernel that has a problem
>> with memory setup. That is of cause a bug that needs further attention.
>>
>
> I did not touch this when I updated the doc. I believe the doc means
> CONFIG_EFI_LOADER is not currently supported. As you mentioned, there
> are still some issues to work out. Maybe after you address all the
> remaining issues, we can update the doc for its support :)

I tested CONFIG_EFI_LOADER today, with U-Boot loads EFI application
and EFI payload, on 32-bit QEMU. Here is the log:

=> load ide 0 1000000 u-boot-app.efi
683843 bytes read in 105 ms (6.2 MiB/s)
=> bootefi 1000000
Scanning disk ide.blk#0...
Found 2 disks
WARNING: booting without device tree
## Starting EFI application at 01000000 ...
U-Boot EFI App starting


U-Boot 2018.07-rc1-00097-gc5eea16 (Jun 12 2018 - 23:02:03 +0800)

CPU: x86_64, vendor AMD, device 663h
DRAM:  32 MiB
Model: EFI x86 Application
Hit any key to stop autoboot:  0
=>
=> reset
resetting ...
U-Boot EFI exiting
## Application terminated, r = 0
=>
=>
=> load ide 0 1000000 u-boot-payload.efi
486203 bytes read in 94 ms (4.9 MiB/s)
=> bootefi 1000000
WARNING: booting without device tree
## Starting EFI application at 01000000 ...
U-Boot EFI Payload


U-Boot 2018.07-rc1-00097-gc5eea16 (Jun 12 2018 - 23:01:24 +0800)

CPU: x86_64, vendor AMD, device 663h
DRAM:  108.2 MiB
MMC:
Video: 1024x768x32
Model: EFI x86 Payload
Net:   No ethernet found.
IDE:   Bus 0: OK Bus 1: OK
  Device 0: Model: QEMU HARDDISK  Firm: 2.5+ Ser#: QM00001
            Type: Hard Disk
            Supports 48-bit addressing
            Capacity: 504.0 MB = 0.4 GB (1032192 x 512)
  Device 1: not available
  Device 2: Model: QEMU Firm: 2.5+ Ser#: QEMU DVD-ROM
            Type: Removable CD ROM
            Capacity: not available
  Device 3: not available
Hit any key to stop autoboot:  0
=>
=>

I can update the documentation to change CONFIG_EFI_LOADER support
status, but that is a separate patch.

Regards,
Bin
Bin Meng June 17, 2018, 1:17 p.m. UTC | #4
On Tue, Jun 12, 2018 at 11:36 PM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Since commit f3b5056c4e72 ("efi_loader: split README.efi into two
> separate documents"), the original README.efi was renamed to
> README.u-boot_on_efi, but x86 doc still refers to the old one.
>
> This updates the x86 doc to reference both README.u-boot_on_efi and
> README.uefi.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
> Changes in v2:
> - update the x86 doc to reference also README.uefi
>
>  doc/README.x86 | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>

applied to u-boot-x86, thanks!
diff mbox series

Patch

diff --git a/doc/README.x86 b/doc/README.x86
index 78664c3..9f657df 100644
--- a/doc/README.x86
+++ b/doc/README.x86
@@ -1134,18 +1134,18 @@  the "Power" submenu from the Windows start menu.
 EFI Support
 -----------
 U-Boot supports booting as a 32-bit or 64-bit EFI payload, e.g. with UEFI.
-This is enabled with CONFIG_EFI_STUB. U-Boot can also run as an EFI
-application, with CONFIG_EFI_APP. The CONFIG_EFI_LOADER option, where U-Booot
-provides an EFI environment to the kernel (i.e. replaces UEFI completely but
-provides the same EFI run-time services) is not currently supported on x86.
+This is enabled with CONFIG_EFI_STUB to boot from both 32-bit and 64-bit
+UEFI BIOS. U-Boot can also run as an EFI application, with CONFIG_EFI_APP.
+The CONFIG_EFI_LOADER option, where U-Booot provides an EFI environment to
+the kernel (i.e. replaces UEFI completely but provides the same EFI run-time
+services) is not currently supported on x86.
 
-See README.efi for details of EFI support in U-Boot.
+See README.u-boot_on_efi and README.uefi for details of EFI support in U-Boot.
 
 64-bit Support
 --------------
 U-Boot supports booting a 64-bit kernel directly and is able to change to
-64-bit mode to do so. It also supports (with CONFIG_EFI_STUB) booting from
-both 32-bit and 64-bit UEFI. However, U-Boot itself is currently always built
+64-bit mode to do so. However, U-Boot itself is currently always built
 in 32-bit mode. Some access to the full memory range is provided with
 arch_phys_memset().