From a29b570ac4618e5b36fd542cf6abbdfea66b0300 Mon Sep 17 00:00:00 2001
From: Vencislav Atanasov <user890104@freemyipod.org>
Date: Sat, 7 Dec 2024 00:47:57 +0200
Subject: [PATCH] S5L8702: Rename nor-* to norboot-*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the SPI NOR flash is only used for the bootloader, rename the files accordingly, This is a preparation for the nandboot driver will be introduced, since S5L8720+ don't have an SPI NOR flash anymore.

This is a part of the large iPod Nano 4G and iPod Touch 2G support patch.

Credit: Cástor Muñoz <cmvidal@gmail.com>
Change-Id: Iea835fd2029470bfe9f813631ad4f3db711facc3
---
 apps/debug_menu.c                                               | 2 +-
 bootloader/ipod-s5l87xx.c                                       | 2 +-
 firmware/SOURCES                                                | 2 +-
 .../target/arm/s5l8702/{nor-s5l8702.c => norboot-s5l8702.c}     | 2 +-
 firmware/target/arm/s5l8702/{nor-target.h => norboot-target.h}  | 0
 utils/mks5lboot/dualboot/Makefile                               | 2 +-
 utils/mks5lboot/dualboot/dualboot.c                             | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename firmware/target/arm/s5l8702/{nor-s5l8702.c => norboot-s5l8702.c} (99%)
 rename firmware/target/arm/s5l8702/{nor-target.h => norboot-target.h} (100%)

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index d816a760f6..c44be3ad1b 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -137,7 +137,7 @@
 #endif
 
 #if defined(IPOD_6G)
-#include "nor-target.h"
+#include "norboot-target.h"
 #endif
 
 #define SCREEN_MAX_CHARS (LCD_WIDTH / SYSFONT_WIDTH)
diff --git a/bootloader/ipod-s5l87xx.c b/bootloader/ipod-s5l87xx.c
index a051870750..9d5949db6b 100644
--- a/bootloader/ipod-s5l87xx.c
+++ b/bootloader/ipod-s5l87xx.c
@@ -56,7 +56,7 @@
 #include "i2c-s5l8702.h"
 #include "gpio-s5l8702.h"
 #include "pmu-target.h"
-#include "nor-target.h"
+#include "norboot-target.h"
 
 
 #define FW_ROCKBOX  0
diff --git a/firmware/SOURCES b/firmware/SOURCES
index e96c90a2d8..f81bcd30e5 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1577,7 +1577,7 @@ target/arm/s5l8702/ipod6g/lcd-asm-6g.S
 target/arm/s5l8702/ipod6g/piezo-6g.c
 target/arm/s5l8702/spi-s5l8702.c
 target/arm/s5l8702/crypto-s5l8702.c
-target/arm/s5l8702/nor-s5l8702.c
+target/arm/s5l8702/norboot-s5l8702.c
 #if 0 //TODO
 target/arm/s5l8702/postmortemstub.S
 #endif
diff --git a/firmware/target/arm/s5l8702/nor-s5l8702.c b/firmware/target/arm/s5l8702/norboot-s5l8702.c
similarity index 99%
rename from firmware/target/arm/s5l8702/nor-s5l8702.c
rename to firmware/target/arm/s5l8702/norboot-s5l8702.c
index d5e811aad3..f0175a02af 100644
--- a/firmware/target/arm/s5l8702/nor-s5l8702.c
+++ b/firmware/target/arm/s5l8702/norboot-s5l8702.c
@@ -27,7 +27,7 @@
 #include "s5l87xx.h"
 #include "spi-s5l8702.h"
 #include "crypto-s5l8702.h"
-#include "nor-target.h"
+#include "norboot-target.h"
 
 static void bootflash_ce(int port, bool state)
 {
diff --git a/firmware/target/arm/s5l8702/nor-target.h b/firmware/target/arm/s5l8702/norboot-target.h
similarity index 100%
rename from firmware/target/arm/s5l8702/nor-target.h
rename to firmware/target/arm/s5l8702/norboot-target.h
diff --git a/utils/mks5lboot/dualboot/Makefile b/utils/mks5lboot/dualboot/Makefile
index 51ce816ca0..41887d09a0 100644
--- a/utils/mks5lboot/dualboot/Makefile
+++ b/utils/mks5lboot/dualboot/Makefile
@@ -45,7 +45,7 @@ SOURCES  = init.S dualboot.c
 SOURCES += $(ROOTDIR)/lib/arm_support/support-arm.S
 SOURCES += $(wildcard $(FIRMDIR)/asm/mem*.c $(FIRMDIR)/libc/mem*.c)
 SOURCES += $(addprefix $(FWARM)/, mmu-arm.S)
-SOURCES += $(addprefix $(FW8702)/, clocking-s5l8702.c spi-s5l8702.c nor-s5l8702.c crypto-s5l8702.c)
+SOURCES += $(addprefix $(FW8702)/, clocking-s5l8702.c spi-s5l8702.c norboot-s5l8702.c crypto-s5l8702.c)
 # target/loader specific sources
 SRCTARGET = piezo-.c
 $(foreach l, $(LOADERS), $(foreach t, $(TARGETS),\
diff --git a/utils/mks5lboot/dualboot/dualboot.c b/utils/mks5lboot/dualboot/dualboot.c
index 2d41d46ad9..c3a60572a4 100644
--- a/utils/mks5lboot/dualboot/dualboot.c
+++ b/utils/mks5lboot/dualboot/dualboot.c
@@ -28,7 +28,7 @@
 #include "s5l87xx.h"
 #include "clocking-s5l8702.h"
 #include "spi-s5l8702.h"
-#include "nor-target.h"
+#include "norboot-target.h"
 #include "piezo.h"
 
 /* How it works: