--- a/baseport/syborg/bootstrap/syborg.inc	Fri Oct 15 16:19:01 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.inc	Fri Oct 29 23:44:35 2010 +0100
@@ -55,9 +55,9 @@
 KHwBaseWebcamera	EQU     KHwBaseRegisters + 0x0f000
 KHwNVMemoryDevice			EQU		KHwBaseRegisters + 0x10000
 ; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
-; KHwBasePlatform		EQU     KHwBaseRegisters + 0x12000
-KHwBaseTimer2		EQU	KHwBaseRegisters + 0x12000
-KHwBasePlatform		EQU     KHwBaseRegisters + 0x13000
+
+KHwBaseTimer2		EQU	KHwBaseRegisters + 0x11000
+KHwBasePlatform		EQU     KHwBaseRegisters + 0x12000
 ; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
 
 ;-----------------------------------------------------------------------------
@@ -87,9 +87,9 @@
 KHwLinBaseWebcameraDevice	EQU	KHwLinBaseRegisters + 0x0f*KHwLinSeparation
 KHwLinBaseNVMemory	EQU	KHwLinBaseRegisters + 0x10*KHwLinSeparation
 ; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
-; KHwLinBasePlatform	EQU	KHwLinBaseRegisters + 0x12*KHwLinSeparation
-KHwLinBaseTimer2		EQU	KHwLinBaseRegisters + 0x12*KHwLinSeparation
-KHwLinBasePlatform	EQU	KHwLinBaseRegisters + 0x13*KHwLinSeparation
+
+KHwLinBaseTimer2		EQU	KHwLinBaseRegisters + 0x11*KHwLinSeparation
+KHwLinBasePlatform	EQU	KHwLinBaseRegisters + 0x12*KHwLinSeparation
 ; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
 	
 	END

--- a/baseport/syborg/specific/syborg.h	Fri Oct 15 16:19:01 2010 +0100
+++ b/baseport/syborg/specific/syborg.h	Fri Oct 29 23:44:35 2010 +0100
@@ -57,9 +57,8 @@
 const TUint KHwSVPWebcameraDevice		= KHwBasePeripherals + 0x0f*KHwLinSeparation;
 const TUint KHwNVMemoryDevice			= KHwBasePeripherals + 0x10*KHwLinSeparation;
 // NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
-//const TUint KHwSVPPlatformDevice		= KHwBasePeripherals + 0x12*KHwLinSeparation;
-const TUint KHwBaseCounterTimer2		= KHwBasePeripherals + 0x12*KHwLinSeparation;
-const TUint KHwSVPPlatformDevice		= KHwBasePeripherals + 0x13*KHwLinSeparation;
+const TUint KHwBaseCounterTimer2		= KHwBasePeripherals + 0x11*KHwLinSeparation;
+const TUint KHwSVPPlatformDevice		= KHwBasePeripherals + 0x12*KHwLinSeparation;
 // NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
 	
 enum TSyborgInterruptId

Binary file baseport/syborg/syborg.dtb has changed

--- a/baseport/syborg/syborg.dts	Fri Oct 15 16:19:01 2010 +0100
+++ b/baseport/syborg/syborg.dts	Fri Oct 29 23:44:35 2010 +0100
@@ -132,14 +132,14 @@
         };
         timer@1 {
             compatible = "syborg,timer";
-            reg = <c0012000>;
+            reg = <c0011000>;
             frequency = <d#0100000>;
             interrupts = <e>;
             interrupt-parent = <&intc>;
         };
         platform@0 {
             compatible = "syborg,platform";
-            reg = <c0013000>;
+            reg = <c0012000>;
         };
     };
 };