From a43e2bbc468a71fb8825e8acafb7fac7ad7c6dad Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 7 Mar 2018 10:04:07 +0100 Subject: ARM: return positive offset in get_runtime_offset() When we are linked at 0x0 and running at 0x01000000 then get_runtime_offset() should return 0x01000000 and not 0xff000000. This makes get_runtime_offset() more consistent and better understandable. This was tested on a Freescale i.MX53 Quickstart board. Additionally relocate_to_adr() was tested since that is normally not called. Signed-off-by: Sascha Hauer --- arch/arm/boards/karo-tx6x/lowlevel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/arm/boards/karo-tx6x') diff --git a/arch/arm/boards/karo-tx6x/lowlevel.c b/arch/arm/boards/karo-tx6x/lowlevel.c index f2643efb05..7b58a496ef 100644 --- a/arch/arm/boards/karo-tx6x/lowlevel.c +++ b/arch/arm/boards/karo-tx6x/lowlevel.c @@ -53,7 +53,7 @@ ENTRY_FUNCTION(start_imx6dl_tx6x_512m, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = __dtb_imx6dl_tx6u_start - get_runtime_offset(); + fdt = __dtb_imx6dl_tx6u_start + get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_512M, fdt); } @@ -73,7 +73,7 @@ ENTRY_FUNCTION(start_imx6dl_tx6x_1g, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = __dtb_imx6dl_tx6u_start - get_runtime_offset(); + fdt = __dtb_imx6dl_tx6u_start + get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } @@ -93,7 +93,7 @@ ENTRY_FUNCTION(start_imx6q_tx6x_1g, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = __dtb_imx6q_tx6q_start - get_runtime_offset(); + fdt = __dtb_imx6q_tx6q_start + get_runtime_offset(); imx6q_barebox_entry(fdt); } @@ -113,7 +113,7 @@ ENTRY_FUNCTION(start_imx6q_tx6x_2g, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = __dtb_imx6q_tx6q_start - get_runtime_offset(); + fdt = __dtb_imx6q_tx6q_start + get_runtime_offset(); imx6q_barebox_entry(fdt); } -- cgit v1.2.3