[v2,3/3] ARM: qemu-arm: define fdt_addr_r

Message ID 20181022044007.11796-4-takahiro.akashi@linaro.org
State New
Headers show
Series
  • efi_loader: improve boot sequence in distro_bootcmd
Related show

Commit Message

AKASHI Takahiro Oct. 22, 2018, 4:40 a.m.
This variable, fdt_addr_t, is missing in the current qemu-arm.h while it
seems to be mandatory, at least, to run distro_bootcmd as expected.
So just add its definition. A size of 1MB would be enough.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 include/configs/qemu-arm.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Tuomas Tynkkynen Oct. 24, 2018, 10:43 a.m. | #1
Hi Takahiro,

On Mon, 22 Oct 2018 13:40:07 +0900
AKASHI Takahiro <takahiro.akashi@linaro.org> wrote:

> This variable, fdt_addr_t, is missing in the current qemu-arm.h while
> it seems to be mandatory, at least, to run distro_bootcmd as expected.
> So just add its definition. A size of 1MB would be enough.
> 
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> ---
>  include/configs/qemu-arm.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
> index 91fb8d47edf8..0e66f946dde5 100644
> --- a/include/configs/qemu-arm.h
> +++ b/include/configs/qemu-arm.h
> @@ -55,6 +55,7 @@
>  	"fdt_high=0xffffffff\0" \
>  	"initrd_high=0xffffffff\0" \
>  	"fdt_addr=0x40000000\0" \
> +	"fdt_addr_r=0x40100000\0" \
>  	"scriptaddr=0x40200000\0" \
>  	"pxefile_addr_r=0x40300000\0" \
>  	"kernel_addr_r=0x40400000\0" \

The same problem as in the previous version still exists; applying
these as-is would regress any boot entries in PXE files that use the
FDTDIR directive since it'd try to load a non-existent .dtb and fail.

We need some way to avoid that; maybe some magic value
(e.g. fdtfile=none) or a separate environment variable or CONFIG_
option.

- Tuomas

Patch

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 91fb8d47edf8..0e66f946dde5 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -55,6 +55,7 @@ 
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr=0x40000000\0" \
+	"fdt_addr_r=0x40100000\0" \
 	"scriptaddr=0x40200000\0" \
 	"pxefile_addr_r=0x40300000\0" \
 	"kernel_addr_r=0x40400000\0" \