summaryrefslogtreecommitdiffstats
path: root/src/soc/nvidia/tegra210
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/nvidia/tegra210')
-rw-r--r--src/soc/nvidia/tegra210/bootblock.c5
-rw-r--r--src/soc/nvidia/tegra210/bootblock_asm.S2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index 96fb9b22d56e..383e578eeb58 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -31,6 +31,9 @@
#define ODMDATA_OFFSET_IN_BCT 0x508
#define TEGRA_SRAM_MAX (TEGRA_SRAM_BASE + TEGRA_SRAM_SIZE)
+/* called from assembly in bootblock_asm.S */
+void tegra210_main(void);
+
static void save_odmdata(void)
{
struct tegra_pmc_regs *pmc = (struct tegra_pmc_regs*)TEGRA_PMC_BASE;
@@ -155,7 +158,7 @@ static void mbist_workaround(void)
}
}
-void main(void)
+void tegra210_main(void)
{
// enable JTAG at the earliest stage
enable_jtag();
diff --git a/src/soc/nvidia/tegra210/bootblock_asm.S b/src/soc/nvidia/tegra210/bootblock_asm.S
index 62554422dbdf..6ea154abab66 100644
--- a/src/soc/nvidia/tegra210/bootblock_asm.S
+++ b/src/soc/nvidia/tegra210/bootblock_asm.S
@@ -37,5 +37,5 @@ ENTRY(_start)
*/
msr cpsr_cxf, #0xdf
- stack_init stack_top=_estack stack_bottom=_stack seed=1 func=main
+ stack_init stack_top=_estack stack_bottom=_stack seed=1 func=tegra210_main
ENDPROC(_start)