aboutsummaryrefslogtreecommitdiff
path: root/src/soc/nvidia/tegra124
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/nvidia/tegra124')
-rw-r--r--src/soc/nvidia/tegra124/bootblock.c5
-rw-r--r--src/soc/nvidia/tegra124/bootblock_asm.S2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c
index c7503041b4..1793aaf3de 100644
--- a/src/soc/nvidia/tegra124/bootblock.c
+++ b/src/soc/nvidia/tegra124/bootblock.c
@@ -26,6 +26,9 @@
#include <timestamp.h>
#include <vendorcode/google/chromeos/chromeos.h>
+/* called from assembly in bootblock_asm.S */
+void tegra124_main(void);
+
static void run_next_stage(void *entry)
{
ASSERT(entry);
@@ -41,7 +44,7 @@ static void run_next_stage(void *entry)
clock_halt_avp();
}
-void main(void)
+void tegra124_main(void)
{
// enable pinmux clamp inputs
clamp_tristate_inputs();
diff --git a/src/soc/nvidia/tegra124/bootblock_asm.S b/src/soc/nvidia/tegra124/bootblock_asm.S
index 0391ebf1ac..dca5314dc9 100644
--- a/src/soc/nvidia/tegra124/bootblock_asm.S
+++ b/src/soc/nvidia/tegra124/bootblock_asm.S
@@ -66,5 +66,5 @@ call_bootblock:
* Thumb. However, "b" will not and GCC may attempt to create a
* wrapper which is currently broken.
*/
- bl main
+ bl tegra124_main
ENDPROC(_start)