diff mbox series

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

Message ID 20231116101750.2624046-1-randolph@andestech.com
State Superseded
Delegated to: Andes
Headers show
Series [V2] riscv: binman: fix the load field format | expand

Commit Message

Randolph Nov. 16, 2023, 10:17 a.m. UTC
Using /bits/64 prefix for 64bits address

Signed-off-by: Randolph <randolph@andestech.com>
---
 arch/riscv/dts/binman.dtsi | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Comments

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

Reviewed-by: Simon Glass <sjg@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
>
diff mbox series

Patch

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";