Index: firmware/export/config-ipod1g2g.h
===================================================================
--- firmware/export/config-ipod1g2g.h	(revision 18300)
+++ firmware/export/config-ipod1g2g.h	(working copy)
@@ -87,7 +87,7 @@
 #define BATTERY_TYPES_COUNT  1    /* only one type */
 
 /* Hardware controlled charging? FIXME */
-//#define CONFIG_CHARGING CHARGING_SIMPLE
+#define CONFIG_CHARGING CHARGING_SIMPLE
 
 /* FIXME: Don't shutdown on low battery until we have proper suspend. */
 #define NO_LOW_BATTERY_SHUTDOWN
Index: firmware/target/arm/ipod/power-ipod.c
===================================================================
--- firmware/target/arm/ipod/power-ipod.c	(revision 18300)
+++ firmware/target/arm/ipod/power-ipod.c	(working copy)
@@ -50,7 +50,10 @@
 #elif defined(IPOD_4G) || defined(IPOD_COLOR) \
        || defined(IPOD_MINI) || defined(IPOD_MINI2G)
     /* C2 is firewire power */
-    return (GPIOC_INPUT_VAL & 0x04)?false:true; 
+    return (GPIOC_INPUT_VAL & 0x04)?false:true;
+#elif defined(IPOD_1G2G)
+    /* C4 is firewire power */
+    return (GPIOC_INPUT_VAL & 0x10)?false:true;
 #else
     /* This needs filling in for other ipods. */
     return false;