[PATCH 2/2] boards: samx6: Adjust to latest get_runtime_offset()

Andrey Smirnov andrew.smirnov at gmail.com
Mon Apr 9 18:36:37 PDT 2018


Latest version of get_runtime_offset() returns positive offset that
needs to be added to rather than substracted from original pointer.

Cc: Michael Grzeschik <m.grzeschik at pengutronix.de>
Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>
---

Sascha:

This one obviously needs to go into master as well. Sorry for the
noise if this has already been fixed.

Thanks,
Andrey Smirnov

 arch/arm/boards/kontron-samx6i/lowlevel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/kontron-samx6i/lowlevel.c b/arch/arm/boards/kontron-samx6i/lowlevel.c
index 4113ddbb4..5c3500704 100644
--- a/arch/arm/boards/kontron-samx6i/lowlevel.c
+++ b/arch/arm/boards/kontron-samx6i/lowlevel.c
@@ -47,7 +47,7 @@ static void __noreturn start_imx6_samx6i_common(void *fdt_blob_fixed_offset)
 	if (IS_ENABLED(CONFIG_DEBUG_LL))
 		setup_uart();
 
-	fdt = fdt_blob_fixed_offset - get_runtime_offset();
+	fdt = fdt_blob_fixed_offset + get_runtime_offset();
 
 	barebox_arm_entry(0x10000000, size, fdt);
 }
-- 
2.14.3




More information about the barebox mailing list