[PATCH 1/2] xilinx: Align dfu ram with booti command

[Michal Simek]

st 15. 7. 2020 v 15:51 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> Image should be loaded to 0x80000 address and not to $kernel_addr_r.
> Also kernel_addr, fdt_addr and fdt_size in zynqmp case are not defined
> that's why define it to be aligned with Versal.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  include/configs/xilinx_versal.h | 2 +-
>  include/configs/xilinx_zynqmp.h | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
> index 804525dcad26..32cd5b21f7b7 100644
> --- a/include/configs/xilinx_versal.h
> +++ b/include/configs/xilinx_versal.h
> @@ -54,7 +54,7 @@
>  #define DFU_ALT_INFO_RAM \
>         "dfu_ram_info=" \
>         "setenv dfu_alt_info " \
> -       "Image ram $kernel_addr_r $kernel_size_r\\\\;" \
> +       "Image ram 80000 $kernel_size_r\\\\;" \
>         "system.dtb ram $fdt_addr_r $fdt_size_r\0" \
>         "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
>         "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index e7cfebee7c46..86f292761b38 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -58,8 +58,8 @@
>  #define DFU_ALT_INFO_RAM \
>         "dfu_ram_info=" \
>         "setenv dfu_alt_info " \
> -       "Image ram $kernel_addr $kernel_size\\\\;" \
> -       "system.dtb ram $fdt_addr $fdt_size\0" \
> +       "Image ram 80000 $kernel_size_r\\\\;" \
> +       "system.dtb ram $fdt_addr_r $fdt_size_r\0" \
>         "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
>         "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
>
> @@ -101,8 +101,10 @@
>  #define ENV_MEM_LAYOUT_SETTINGS \
>         "fdt_high=10000000\0" \
>         "fdt_addr_r=0x40000000\0" \
> +       "fdt_size_r=0x400000\0" \
>         "pxefile_addr_r=0x10000000\0" \
>         "kernel_addr_r=0x18000000\0" \
> +       "kernel_size_r=0x10000000\0" \
>         "scriptaddr=0x20000000\0" \
>         "ramdisk_addr_r=0x02100000\0" \
>         "script_size_f=0x80000\0" \
> --
> 2.27.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs