From 650eaa39c4665a08d882217550f1959a49c0c039 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 15 Jul 2020 14:18:09 -0400 Subject: [PATCH] rk27xx: rename 'start' to '__start' Change-Id: I3c5bbbc952222e840e82171431ba996a6a5d298b --- firmware/target/arm/rk27xx/app.lds | 2 +- firmware/target/arm/rk27xx/boot.lds | 2 +- firmware/target/arm/rk27xx/crt0.S | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/target/arm/rk27xx/app.lds b/firmware/target/arm/rk27xx/app.lds index fb2cc54db6..392946a175 100644 --- a/firmware/target/arm/rk27xx/app.lds +++ b/firmware/target/arm/rk27xx/app.lds @@ -1,6 +1,6 @@ #include "config.h" -ENTRY(start) +ENTRY(__start) #ifdef ROCKBOX_LITTLE_ENDIAN OUTPUT_FORMAT(elf32-littlearm) #else diff --git a/firmware/target/arm/rk27xx/boot.lds b/firmware/target/arm/rk27xx/boot.lds index 5e25d12dab..ca998e3a75 100644 --- a/firmware/target/arm/rk27xx/boot.lds +++ b/firmware/target/arm/rk27xx/boot.lds @@ -1,6 +1,6 @@ #include "config.h" -ENTRY(start) +ENTRY(__start) #ifdef ROCKBOX_LITTLE_ENDIAN OUTPUT_FORMAT(elf32-littlearm) #else diff --git a/firmware/target/arm/rk27xx/crt0.S b/firmware/target/arm/rk27xx/crt0.S index fb5f02dbdc..457d423e4c 100644 --- a/firmware/target/arm/rk27xx/crt0.S +++ b/firmware/target/arm/rk27xx/crt0.S @@ -23,12 +23,12 @@ #include "config.h" #include "cpu.h" - .global start + .global __start .global entry_point /* Exception vectors */ .section .intvect,"ax",%progbits - ldr pc, =start + ldr pc, =__start ldr pc, =undef_instr_handler ldr pc, =software_int_handler ldr pc, =prefetch_abort_handler @@ -39,7 +39,7 @@ .ltorg .text -start: +__start: msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ/FIQ */ #ifdef BOOTLOADER