[PATCH V2] riscv: binman: fix the load field format

Simon Glass sjg at chromium.org
Thu Nov 16 17:04:28 CET 2023


On Thu, 16 Nov 2023 at 03:18, Randolph <randolph at andestech.com> wrote:
>
> Using /bits/64 prefix for 64bits address
>
> Signed-off-by: Randolph <randolph at andestech.com>
> ---
>  arch/riscv/dts/binman.dtsi | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
>

Reviewed-by: Simon Glass <sjg at chromium.org>

It is normally written '/bits/ 64' i.e. with a space.


> diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi
> index 6b4eb8dc7b..777b1309d0 100644
> --- a/arch/riscv/dts/binman.dtsi
> +++ b/arch/riscv/dts/binman.dtsi
> @@ -5,9 +5,6 @@
>
>  #include <config.h>
>
> -#define U64_TO_U32_H(addr)             (((addr) >> 32) & 0xffffffff)
> -#define U64_TO_U32_L(addr)             ((addr) & 0xffffffff)
> -
>  / {
>         binman: binman {
>                 multiple-images;
> @@ -36,8 +33,7 @@
>                                         os = "U-Boot";
>                                         arch = "riscv";
>                                         compression = "none";
> -                                       load = <U64_TO_U32_H(CONFIG_TEXT_BASE)
> -                                               U64_TO_U32_L(CONFIG_TEXT_BASE)>;
> +                                       load = /bits/64 <CONFIG_TEXT_BASE>;
>
>                                         uboot_blob: blob-ext {
>                                                 filename = "u-boot-nodtb.bin";
> @@ -50,7 +46,7 @@
>                                         os = "Linux";
>                                         arch = "riscv";
>                                         compression = "none";
> -                                       load = <CONFIG_TEXT_BASE>;
> +                                       load = /bits/64 <CONFIG_TEXT_BASE>;
>
>                                         linux_blob: blob-ext {
>                                                 filename = "Image";
> @@ -64,10 +60,8 @@
>                                         os = "opensbi";
>                                         arch = "riscv";
>                                         compression = "none";
> -                                       load = <U64_TO_U32_H(CONFIG_SPL_OPENSBI_LOAD_ADDR)
> -                                               U64_TO_U32_L(CONFIG_SPL_OPENSBI_LOAD_ADDR)>;
> -                                       entry = <U64_TO_U32_H(CONFIG_SPL_OPENSBI_LOAD_ADDR)
> -                                               U64_TO_U32_L(CONFIG_SPL_OPENSBI_LOAD_ADDR)>;
> +                                       load = /bits/64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
> +                                       entry = /bits/64 <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
>
>                                         opensbi_blob: opensbi {
>                                                 filename = "fw_dynamic.bin";
> --
> 2.34.1
>


More information about the U-Boot mailing list