From e75e9d22fa153882c8fe7b70956de480823cc6bb Mon Sep 17 00:00:00 2001 From: mojyack Date: Tue, 28 Apr 2026 16:05:39 +0900 Subject: [PATCH] bootloader: rk27xx: fix duplicate symbol error in enter_rkusb since it's a static function, it may be inlined. use local labels to fix duplicate-symbol errors. Change-Id: Icba6e6876077e874ab5cfcdc3c774acb663356a1 --- bootloader/rk27xx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c index 69b7f6a0aa..4f04bebfc8 100644 --- a/bootloader/rk27xx.c +++ b/bootloader/rk27xx.c @@ -67,7 +67,7 @@ static void enter_rkusb(void) "ldr r1, [r0] \n" "ldr r2, =0xa1000604 \n" "cmp r1, r2 \n" - "bne rk27xx_new \n" + "bne 2f \n" /* Setup stacks in unmapped * iram just as rom will do. @@ -77,16 +77,16 @@ static void enter_rkusb(void) * but memory addresses are slightly * different. */ - "rk27xx_old: \n" + "1: \n" /* rk27xx_old */ "ldr r1, =0x18200258 \n" "ldr r0, =0xaf0 \n" - "b jump_to_rom \n" + "b 3f \n" - "rk27xx_new: \n" + "2: \n" /* rk27xx_new */ "ldr r1, =0x18200274 \n" "ldr r0, =0xec0 \n" - "jump_to_rom: \n" + "3: \n" /* jump to ROM */ "msr cpsr, #0xd2 \n" "add r1, r1, #0x200 \n" "mov sp, r1 \n"