Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / tegra-u-boot.dtsi

diff --git a/arch/arm/dts/tegra-u-boot.dtsi b/arch/arm/dts/tegra-u-boot.dtsi
index cde591c5fca410913713ca28372eab1194d8dbd8..fe19619919ec54446cacea103afb8b7c6aa4ace8 100644 (file)
--- a/arch/arm/dts/tegra-u-boot.dtsi
+++ b/arch/arm/dts/tegra-u-boot.dtsi
@@ -1,5 +1,11 @@
 #include <config.h>
 
+#ifdef CONFIG_SPL_TEXT_BASE
+#define U_BOOT_OFFSET (CONFIG_SYS_TEXT_BASE - CONFIG_SPL_TEXT_BASE)
+#else
+#define U_BOOT_OFFSET 0
+#endif
+
 / {
        binman {
                multiple-images;
@@ -9,8 +15,7 @@
                        u-boot-spl {
                        };
                        u-boot {
-                               pos = <(CONFIG_SYS_TEXT_BASE -
-                                       CONFIG_SPL_TEXT_BASE)>;
+                               offset = <(U_BOOT_OFFSET)>;
                        };
                };
 
@@ -21,8 +26,7 @@
                        u-boot-spl {
                        };
                        u-boot {
-                               pos = <(CONFIG_SYS_TEXT_BASE -
-                                       CONFIG_SPL_TEXT_BASE)>;
+                               offset = <(U_BOOT_OFFSET)>;
                        };
                };
 
@@ -32,8 +36,7 @@
                        u-boot-spl {
                        };
                        u-boot-nodtb {
-                               pos = <(CONFIG_SYS_TEXT_BASE -
-                                       CONFIG_SPL_TEXT_BASE)>;
+                               offset = <(U_BOOT_OFFSET)>;
                        };
                };
        };