Further G1/G2 work. Bootloader compiles now, but probably won't work.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14017 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 16 insertions, 1 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 6e7762a..7d8efbe 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -632,6 +632,19 @@ target/arm/usb-pp.c
 #endif /* SIMULATOR */
 #endif /* IPOD_3G */
 
+#ifdef IPOD_1G2G
+#ifndef SIMULATOR
+target/arm/ata-pp5002.c
+target/arm/wmcodec-pp.c
+target/arm/i2s-pp.c
+target/arm/ipod/adc-ipod.c
+target/arm/ipod/3g/backlight-3g.c /* FIXME */
+target/arm/ipod/3g/button-3g.c /* FIXME */
+target/arm/ipod/lcd-gray.c
+target/arm/ipod/power-ipod.c
+#endif /* SIMULATOR */
+#endif /* IPOD_1G2G */
+
 #ifdef IPOD_MINI
 #ifndef SIMULATOR
 drivers/pcf50605.c
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h
index e855241..40b1584 100644
--- a/firmware/export/config-ipod1g2g.h
+++ b/firmware/export/config-ipod1g2g.h
@@ -1,5 +1,5 @@
 /*
- * This config file is for the Apple iPod 3g
+ * This config file is for the Apple iPod 1g and 2g
  */
 #define TARGET_TREE /* this target is using the target tree system */
 
diff --git a/tools/scramble.c b/tools/scramble.c
index 5317283..b7c8d1f 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -226,6 +226,8 @@ int main (int argc, char** argv)
             modelnum = 17;
         else if(!strcmp(&argv[1][5], "giga"))
             modelnum = 18;
+        else if(!strcmp(&argv[1][5], "1g2g"))
+            modelnum = 19;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;