Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2f43f85460453f928005e06915892167addbd49a

Authored by Simon Glass
Committed by Minkyu Kang
1 parent a9cf6da925
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

initcall: Improve debugging support 

Add the ability to display the code offset of an initcall even after it
is relocated. This makes it much easier to relate initcalls back to the
U-Boot System.map file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Showing 2 changed files with 13 additions and 6 deletions Side-by-side Diff

... ... @@ -6,5 +6,5 @@
6 6  
7 7 typedef int (*init_fnc_t)(void);
8 8  
9   -int initcall_run_list(init_fnc_t init_sequence[]);
  9 +int initcall_run_list(const init_fnc_t init_sequence[]);
... ... @@ -7,15 +7,22 @@
7 7 #include <common.h>
8 8 #include <initcall.h>
9 9  
10   -int initcall_run_list(init_fnc_t init_sequence[])
  10 +DECLARE_GLOBAL_DATA_PTR;
  11 +
  12 +int initcall_run_list(const init_fnc_t init_sequence[])
11 13 {
12   - init_fnc_t *init_fnc_ptr;
  14 + const init_fnc_t *init_fnc_ptr;
13 15  
14 16 for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
15   - debug("initcall: %p\n", *init_fnc_ptr);
  17 + unsigned long reloc_ofs = 0;
  18 +
  19 + if (gd->flags & GD_FLG_RELOC)
  20 + reloc_ofs = gd->reloc_off;
  21 + debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
16 22 if ((*init_fnc_ptr)()) {
17   - debug("initcall sequence %p failed at call %p\n",
18   - init_sequence, *init_fnc_ptr);
  23 + printf("initcall sequence %p failed at call %p\n",
  24 + init_sequence,
  25 + (char *)*init_fnc_ptr - reloc_ofs);
19 26 return -1;
20 27 }
21 28 }