From fc4e0d912e0afb85da73290ee45e2ea0d1f929b7 Mon Sep 17 00:00:00 2001
From: Vencislav Atanasov <user890104@freemyipod.org>
Date: Sat, 25 Jan 2025 02:21:56 +0200
Subject: [PATCH] iPod S5L87xx bootloader: Move variable declaration to avoid
 macros

No change in the bootloader binary for ipod6g.

Change-Id: I17a91ec8a710250b5400b06f9520360b814d1184
---
 bootloader/ipod-s5l87xx.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bootloader/ipod-s5l87xx.c b/bootloader/ipod-s5l87xx.c
index a5967428a5..800f8133fd 100644
--- a/bootloader/ipod-s5l87xx.c
+++ b/bootloader/ipod-s5l87xx.c
@@ -613,11 +613,6 @@ void main(void)
 {
     int rc = 0;
 
-#ifndef S5L87XX_DEVELOPMENT_BOOTLOADER
-    unsigned char *loadbuffer;
-    int (*kernel_entry)(void);
-#endif
-
     usec_timer_init();
 
 #ifdef S5L87XX_DEVELOPMENT_BOOTLOADER
@@ -763,7 +758,7 @@ void main(void)
     }
 
     printf("Loading Rockbox...");
-    loadbuffer = (unsigned char *)DRAM_ORIG;
+    unsigned char *loadbuffer = (unsigned char *)DRAM_ORIG;
     rc = load_firmware(loadbuffer, BOOTFILE, MAX_LOADSIZE);
 
     if (rc <= EFILE_EMPTY) {
@@ -778,7 +773,7 @@ void main(void)
     /* If we get here, we have a new firmware image at 0x08000000, run it */
     disable_irq();
 
-    kernel_entry = (void*) loadbuffer;
+    int (*kernel_entry)(void) = (void*)loadbuffer;
     commit_discard_idcache();
     rc = kernel_entry();