]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
riscv: binman: fix the load field format
authorRandolph <randolph@andestech.com>
Fri, 17 Nov 2023 10:39:50 +0000 (18:39 +0800)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Wed, 6 Dec 2023 08:05:39 +0000 (16:05 +0800)
Using /bits/ 64 prefix for 64 bits address

Signed-off-by: Randolph <randolph@andestech.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
arch/riscv/dts/binman.dtsi

index 6b4eb8dc7b9c9f21654c6cd7c0acb1c2c0875945..9271de0ddfcc2e30c60c8e203a302828330c64cf 100644 (file)
@@ -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";
                                        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";