2 files changed, 31 insertions, 4 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index e827f964f5..b836601ed3 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1568,6 +1568,9 @@ target/arm/s5l8702/clocking-s5l8702.c
 target/arm/s5l8702/ipod6g/lcd-6g.c
 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
 #if 0 //TODO
 target/arm/s5l8702/postmortemstub.S
 #endif
@@ -1587,10 +1590,6 @@ target/arm/s5l8702/debug-s5l8702.c
 target/arm/s5l8702/pcm-s5l8702.c
 target/arm/s5l8702/ipod6g/audio-6g.c
 target/arm/s5l8702/ipod6g/cscodec-6g.c
-#else
-target/arm/s5l8702/spi-s5l8702.c
-target/arm/s5l8702/crypto-s5l8702.c
-target/arm/s5l8702/nor-s5l8702.c
 #endif /* BOOTLOADER */
 #endif /* IPOD_6G */
 
diff --git a/firmware/target/arm/s5l8702/nor-target.h b/firmware/target/arm/s5l8702/nor-target.h
index 4ebe1d58d4..3d2790d123 100644
--- a/firmware/target/arm/s5l8702/nor-target.h
+++ b/firmware/target/arm/s5l8702/nor-target.h
@@ -87,6 +87,34 @@ int bootflash_compare(int port, int offset, void* addr, int size);
 void bootflash_erase_blocks(int port, int first, int n);
 void bootflash_close(int port);
 
+/*
+ * SysCfg
+ */
+struct SysCfgHeader {
+    uint32_t magic; // always 'SCfg'
+    uint32_t size;
+    uint32_t unknown1; // 0x00000200 on iPod classic
+    uint32_t version; // maybe? 0x00010001 on iPod classic
+    uint32_t unknown2; // 0x00000000 on iPod classic
+    uint32_t num_entries;
+}; // 0x18
+
+struct SysCfgEntry {
+    uint32_t tag;
+    uint8_t data[0x10];
+};
+
+#define SYSCFG_MAGIC 0x53436667 // SCfg
+
+#define SYSCFG_TAG_SRNM 0x53724e6d // SrNm
+#define SYSCFG_TAG_FWID 0x46774964 // FwId
+#define SYSCFG_TAG_HWID 0x48774964 // HwId
+#define SYSCFG_TAG_HWVR 0x48775672 // HwVr
+#define SYSCFG_TAG_CODC 0x436f6463 // Codc
+#define SYSCFG_TAG_SWVR 0x53775672 // SwVr
+#define SYSCFG_TAG_MLBN 0x4d4c424e // MLBN
+#define SYSCFG_TAG_MODN 0x4d6f6423 // Mod#
+#define SYSCFG_TAG_REGN 0x5265676e // Regn
 
 /*
  * IM3