# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812580 -3600
# Node ID e5bc2850013cfbc07f16dad599f175f7df1b9fb9
# Parent  d4c81235847e6de0eb899873d0d124a6f7f705d2# Parent  4508ea692a4d0be75618d9ead72575c387ddaeab
Catchup to latest Symbian^4

diff -r 4508ea692a4d -r e5bc2850013c omap3530/beagleboard/bld.inf
--- a/omap3530/beagleboard/bld.inf	Fri Jul 16 17:16:18 2010 +0100
+++ b/omap3530/beagleboard/bld.inf	Thu Jul 22 16:29:40 2010 +0100
@@ -47,9 +47,15 @@
 start		extension		base/bootstrap
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
+#endif
+#ifdef GCCE
+option		GCCE			GCCE
+#endif
+#ifdef ARMCC
+option		ARMCC			ARMCC
 #endif
 option		NAME			_beagle_bootrom
 option		CPU			arm
@@ -57,7 +63,7 @@
 option		SOURCES			beagle.s
 option		EXTRA_SRC_PATH		$(EXTENSION_ROOT)/bootstrap
 option		EXTRA_INC_PATH		$(EXTENSION_ROOT)/bootstrap
-option		INCLUDES		$(EXTENSION_ROOT)/bootstrap/config.inc
+option		INCLUDES		config.inc
 option		E32PATH			$(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/kernel
 
 end
diff -r 4508ea692a4d -r e5bc2850013c omap3530/beagleboard/def/eabi/vbeagle.def
--- a/omap3530/beagleboard/def/eabi/vbeagle.def	Fri Jul 16 17:16:18 2010 +0100
+++ b/omap3530/beagleboard/def/eabi/vbeagle.def	Thu Jul 22 16:29:40 2010 +0100
@@ -1,7 +1,7 @@
 EXPORTS
 	_Z17VariantInitialisev @ 1 NONAME
-	_ZN6Beagle27SystemTimeInSecondsFrom2000ERi @ 2 NONAME
-	_ZN6Beagle30SetSystemTimeInSecondsFrom2000Ei @ 3 NONAME
+	_ZN6Beagle27SystemTimeInSecondsFrom2000ERi @ 2 NONAME ABSENT
+	_ZN6Beagle30SetSystemTimeInSecondsFrom2000Ei @ 3 NONAME ABSENT
 	_ZN7Variant10PowerResetEv @ 4 NONAME
 	_ZN7Variant14BaseLinAddressEv @ 5 NONAME
 	_ZN7Variant15GetMsTickPeriodEv @ 6 NONAME
diff -r 4508ea692a4d -r e5bc2850013c omap3530/beagleboard/src/variant.cia
--- a/omap3530/beagleboard/src/variant.cia	Fri Jul 16 17:16:18 2010 +0100
+++ b/omap3530/beagleboard/src/variant.cia	Thu Jul 22 16:29:40 2010 +0100
@@ -56,7 +56,7 @@
 __NAKED__ void ArmWaitForInterrupt()
 	{
 	//ARM_WFI;
-	asm(".word %a0" : : "i" ((TInt)(0x0320f003 | ((14)<<28) )) )
+	asm(".word %a0" : : "i" ((TInt)(0x0320f003 | ((14)<<28) )) );
 	asm("	bx		lr");
 	}
 
diff -r 4508ea692a4d -r e5bc2850013c omap3530/beagleboard/src/variant.cpp
--- a/omap3530/beagleboard/src/variant.cpp	Fri Jul 16 17:16:18 2010 +0100
+++ b/omap3530/beagleboard/src/variant.cpp	Thu Jul 22 16:29:40 2010 +0100
@@ -676,7 +676,7 @@
 }
 
 
-EXPORT_C TInt  Beagle::SystemTimeInSecondsFrom2000(TInt& aTime)
+TInt  Beagle::SystemTimeInSecondsFrom2000(TInt& aTime)
 	{
 	
 	if(!TPS65950::Initialized())
@@ -718,7 +718,7 @@
 	return KErrNone;
 	}
 
-EXPORT_C TInt Beagle::SetSystemTimeInSecondsFrom2000(TInt aTime)
+TInt Beagle::SetSystemTimeInSecondsFrom2000(TInt aTime)
 	{
 	if(!TPS65950::Initialized())
 		{