--- a/omap3530/assp/inc/assp.mmh	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/assp/inc/assp.mmh	Wed Nov 17 11:02:10 2010 +0000
@@ -139,7 +139,9 @@
 library	AsspTarget(kaomap3530,lib)
 #endif
 
+#ifndef GCCE
 // Enable VFP3
 #define USE_VFP_MATH
 macro __CPU_HAS_VFP
 macro __VFP_V3
+#endif

--- a/omap3530/beagle_drivers/hal/bld.inf	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagle_drivers/hal/bld.inf	Wed Nov 17 11:02:10 2010 +0000
@@ -21,6 +21,12 @@
 PRJ_EXTENSIONS
 start		extension		base/config
 
+#ifdef ARMCC
+option	CONFIG_HCF_FILE	config_vfp.hcf
+#endif
+#ifdef GCCE
+option	CONFIG_HCF_FILE	config_novfp.hcf
+#endif
 option		HALPATH			$(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/halservices
 option		PREFIX			_beagle_
 option		SOURCE			$(EXTENSION_ROOT)/.

--- a/omap3530/beagle_drivers/hal/config.hcf	Tue Nov 16 13:53:39 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-EManufacturer=0
-EManufacturerHardwareRev=0
-EManufacturerSoftwareRev=0
-EManufacturerSoftwareBuild=0
-EModel=0
-EMachineUid=0
-EDeviceFamily=0
-EDeviceFamilyRev=0
-ECPU=0
-ECPUArch=0
-ECPUABI=0
-ECPUSpeed=GetCPUSpeed
-ESystemStartupReason=GetSystemStartupReason
-ESystemException=GetSystemException
-ESystemTickPeriod=0
-EMemoryRAM=GetRAMSize
-EMemoryRAMFree=GetFreeRAM
-EMemoryROM=GetROMSize
-EMemoryPageSize=0
-EPowerGood=GetPowerGoodState
-EAccessoryPower=GetAccessoryPowerPresent
-EPowerBatteryStatus=GetBatteryStatus
-EPowerBackup=GetBackupPresent
-EPowerBackupStatus=GetBackupStatus
-EPowerExternal=GetPowerExternalState
-EKeyboard=ProcessKeyboardInfo
-EKeyboardState : set = ProcessKeyboardState
-EKeyboardDeviceKeys=ProcessKeyboardInfo
-EKeyboardAppKeys=ProcessKeyboardInfo
-EKeyboardClick=GetKeyboardClickPresent
-EKeyboardClickState : set = ProcessKeyboardClickState
-EKeyboardClickVolume : set = ProcessKeyboardClickVolume
-EKeyboardClickVolumeMax=GetKeyboardClickVolumeMax
-EDisplayXPixels=ProcessDisplayCurrentModeInfo
-EDisplayYPixels=ProcessDisplayCurrentModeInfo
-EDisplayXTwips=ProcessDisplayCurrentModeInfo
-EDisplayYTwips=ProcessDisplayCurrentModeInfo
-EDisplayColors=ProcessDisplayColors
-EDisplayState : set = ProcessDisplayState
-EDisplayContrast : set = ProcessDisplayContrast
-EDisplayContrastMax=ProcessDisplayMaxContrast
-EBacklight=GetBacklightPresent
-EBacklightState :set = ProcessBacklightState
-EPen=GetPenPresent
-EPenX=ProcessPenInfo
-EPenY=ProcessPenInfo
-EPenState : set = ProcessPenState
-EPenDisplayOn : set = ProcessPenDisplayOnState
-EPenClick=GetPenClickPresent
-EPenClickState : set = ProcessPenClickState
-EPenClickVolume : set = ProcessPenClickVolume
-EPenClickVolumeMax=GetPenClickVolumeMax
-EMouse=GetMousePresent
-EMouseX=ProcessMouseInfo
-EMouseY=ProcessMouseInfo
-EMouseButtons=ProcessMouseInfo
-EMouseState : set = ProcessMouseState
-EMouseSpeed : set = ProcessMouseSpeed
-EMouseAcceleration : set = ProcessMouseAcceleration
-EMouseButtonState=GetMouseButtonState
-ECaseState=0
-ECaseSwitch=0
-ECaseSwitchDisplayOn=ProcessCaseSwitchDisplayOnState
-ECaseSwitchDisplayOff=ProcessCaseSwitchDisplayOffState
-ELEDs=GetLedCaps
-ELEDmask : set = ProcessLEDMask
-ESwitches=GetSwitches
-EIntegratedPhone=0
-EDisplayBrightness : set = ProcessDisplayBrightness
-EDisplayBrightnessMax=ProcessDisplayMaxBrightness
-EKeyboardBacklightState=0
-ELanguageIndex : set = 0
-EKeyboardIndex : set = 0
-EMaxRAMDriveSize=0
-EDisplayIsMono=ProcessDisplaySpecifiedModeInfo
-EDisplayIsPalettized=ProcessDisplaySpecifiedModeInfo
-EDisplayBitsPerPixel=ProcessDisplaySpecifiedModeInfo
-EDisplayNumModes=ProcessDisplayNumModes
-EDisplayMemoryAddress=ProcessDisplayCurrentModeInfo
-EDisplayOffsetToFirstPixel=ProcessDisplaySpecifiedModeInfo
-EDisplayOffsetBetweenLines=ProcessDisplaySpecifiedModeInfo
-EDisplayPaletteEntry : set = ProcessDisplayPaletteEntry
-EDisplayIsPixelOrderRGB=ProcessDisplayCurrentModeInfo
-EDisplayIsPixelOrderLandscape=ProcessDisplayCurrentModeInfo
-EDisplayMode : set = ProcessDisplayMode
-EDebugPort : set = ProcessDebugPort
-ELocaleLoaded=0
-EClipboardDrive=0
-ECustomRestart : set = ProcessCustomRestart
-ECustomRestartReason=ProcessCustomRestartReason
-ESystemDrive : set = 0
-ENanoTickPeriod=0
-EFastCounterFrequency=0
-EFastCounterCountsUp=0
-EPersistStartupModeKernel : set = ProcessPersistStartupMode
-EMaximumCustomRestartReasons = GetMaximumCustomRestartReasons
-EMaximumRestartStartupModes = GetMaximumRestartStartupModes
-ECustomResourceDrive : set = 0
-EDisplayNumberOfScreens=0
-EHardwareFloatingPoint = GetHardwareFloatingPoint

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/beagle_drivers/hal/config_novfp.hcf	Wed Nov 17 11:02:10 2010 +0000
@@ -0,0 +1,100 @@
+EManufacturer=0
+EManufacturerHardwareRev=0
+EManufacturerSoftwareRev=0
+EManufacturerSoftwareBuild=0
+EModel=0
+EMachineUid=0
+EDeviceFamily=0
+EDeviceFamilyRev=0
+ECPU=0
+ECPUArch=0
+ECPUABI=0
+ECPUSpeed=GetCPUSpeed
+ESystemStartupReason=GetSystemStartupReason
+ESystemException=GetSystemException
+ESystemTickPeriod=0
+EMemoryRAM=GetRAMSize
+EMemoryRAMFree=GetFreeRAM
+EMemoryROM=GetROMSize
+EMemoryPageSize=0
+EPowerGood=GetPowerGoodState
+EAccessoryPower=GetAccessoryPowerPresent
+EPowerBatteryStatus=GetBatteryStatus
+EPowerBackup=GetBackupPresent
+EPowerBackupStatus=GetBackupStatus
+EPowerExternal=GetPowerExternalState
+EKeyboard=ProcessKeyboardInfo
+EKeyboardState : set = ProcessKeyboardState
+EKeyboardDeviceKeys=ProcessKeyboardInfo
+EKeyboardAppKeys=ProcessKeyboardInfo
+EKeyboardClick=GetKeyboardClickPresent
+EKeyboardClickState : set = ProcessKeyboardClickState
+EKeyboardClickVolume : set = ProcessKeyboardClickVolume
+EKeyboardClickVolumeMax=GetKeyboardClickVolumeMax
+EDisplayXPixels=ProcessDisplayCurrentModeInfo
+EDisplayYPixels=ProcessDisplayCurrentModeInfo
+EDisplayXTwips=ProcessDisplayCurrentModeInfo
+EDisplayYTwips=ProcessDisplayCurrentModeInfo
+EDisplayColors=ProcessDisplayColors
+EDisplayState : set = ProcessDisplayState
+EDisplayContrast : set = ProcessDisplayContrast
+EDisplayContrastMax=ProcessDisplayMaxContrast
+EBacklight=GetBacklightPresent
+EBacklightState :set = ProcessBacklightState
+EPen=GetPenPresent
+EPenX=ProcessPenInfo
+EPenY=ProcessPenInfo
+EPenState : set = ProcessPenState
+EPenDisplayOn : set = ProcessPenDisplayOnState
+EPenClick=GetPenClickPresent
+EPenClickState : set = ProcessPenClickState
+EPenClickVolume : set = ProcessPenClickVolume
+EPenClickVolumeMax=GetPenClickVolumeMax
+EMouse=GetMousePresent
+EMouseX=ProcessMouseInfo
+EMouseY=ProcessMouseInfo
+EMouseButtons=ProcessMouseInfo
+EMouseState : set = ProcessMouseState
+EMouseSpeed : set = ProcessMouseSpeed
+EMouseAcceleration : set = ProcessMouseAcceleration
+EMouseButtonState=GetMouseButtonState
+ECaseState=0
+ECaseSwitch=0
+ECaseSwitchDisplayOn=ProcessCaseSwitchDisplayOnState
+ECaseSwitchDisplayOff=ProcessCaseSwitchDisplayOffState
+ELEDs=GetLedCaps
+ELEDmask : set = ProcessLEDMask
+ESwitches=GetSwitches
+EIntegratedPhone=0
+EDisplayBrightness : set = ProcessDisplayBrightness
+EDisplayBrightnessMax=ProcessDisplayMaxBrightness
+EKeyboardBacklightState=0
+ELanguageIndex : set = 0
+EKeyboardIndex : set = 0
+EMaxRAMDriveSize=0
+EDisplayIsMono=ProcessDisplaySpecifiedModeInfo
+EDisplayIsPalettized=ProcessDisplaySpecifiedModeInfo
+EDisplayBitsPerPixel=ProcessDisplaySpecifiedModeInfo
+EDisplayNumModes=ProcessDisplayNumModes
+EDisplayMemoryAddress=ProcessDisplayCurrentModeInfo
+EDisplayOffsetToFirstPixel=ProcessDisplaySpecifiedModeInfo
+EDisplayOffsetBetweenLines=ProcessDisplaySpecifiedModeInfo
+EDisplayPaletteEntry : set = ProcessDisplayPaletteEntry
+EDisplayIsPixelOrderRGB=ProcessDisplayCurrentModeInfo
+EDisplayIsPixelOrderLandscape=ProcessDisplayCurrentModeInfo
+EDisplayMode : set = ProcessDisplayMode
+EDebugPort : set = ProcessDebugPort
+ELocaleLoaded=0
+EClipboardDrive=0
+ECustomRestart : set = ProcessCustomRestart
+ECustomRestartReason=ProcessCustomRestartReason
+ESystemDrive : set = 0
+ENanoTickPeriod=0
+EFastCounterFrequency=0
+EFastCounterCountsUp=0
+EPersistStartupModeKernel : set = ProcessPersistStartupMode
+EMaximumCustomRestartReasons = GetMaximumCustomRestartReasons
+EMaximumRestartStartupModes = GetMaximumRestartStartupModes
+ECustomResourceDrive : set = 0
+EDisplayNumberOfScreens=0
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/beagle_drivers/hal/config_vfp.hcf	Wed Nov 17 11:02:10 2010 +0000
@@ -0,0 +1,101 @@
+EManufacturer=0
+EManufacturerHardwareRev=0
+EManufacturerSoftwareRev=0
+EManufacturerSoftwareBuild=0
+EModel=0
+EMachineUid=0
+EDeviceFamily=0
+EDeviceFamilyRev=0
+ECPU=0
+ECPUArch=0
+ECPUABI=0
+ECPUSpeed=GetCPUSpeed
+ESystemStartupReason=GetSystemStartupReason
+ESystemException=GetSystemException
+ESystemTickPeriod=0
+EMemoryRAM=GetRAMSize
+EMemoryRAMFree=GetFreeRAM
+EMemoryROM=GetROMSize
+EMemoryPageSize=0
+EPowerGood=GetPowerGoodState
+EAccessoryPower=GetAccessoryPowerPresent
+EPowerBatteryStatus=GetBatteryStatus
+EPowerBackup=GetBackupPresent
+EPowerBackupStatus=GetBackupStatus
+EPowerExternal=GetPowerExternalState
+EKeyboard=ProcessKeyboardInfo
+EKeyboardState : set = ProcessKeyboardState
+EKeyboardDeviceKeys=ProcessKeyboardInfo
+EKeyboardAppKeys=ProcessKeyboardInfo
+EKeyboardClick=GetKeyboardClickPresent
+EKeyboardClickState : set = ProcessKeyboardClickState
+EKeyboardClickVolume : set = ProcessKeyboardClickVolume
+EKeyboardClickVolumeMax=GetKeyboardClickVolumeMax
+EDisplayXPixels=ProcessDisplayCurrentModeInfo
+EDisplayYPixels=ProcessDisplayCurrentModeInfo
+EDisplayXTwips=ProcessDisplayCurrentModeInfo
+EDisplayYTwips=ProcessDisplayCurrentModeInfo
+EDisplayColors=ProcessDisplayColors
+EDisplayState : set = ProcessDisplayState
+EDisplayContrast : set = ProcessDisplayContrast
+EDisplayContrastMax=ProcessDisplayMaxContrast
+EBacklight=GetBacklightPresent
+EBacklightState :set = ProcessBacklightState
+EPen=GetPenPresent
+EPenX=ProcessPenInfo
+EPenY=ProcessPenInfo
+EPenState : set = ProcessPenState
+EPenDisplayOn : set = ProcessPenDisplayOnState
+EPenClick=GetPenClickPresent
+EPenClickState : set = ProcessPenClickState
+EPenClickVolume : set = ProcessPenClickVolume
+EPenClickVolumeMax=GetPenClickVolumeMax
+EMouse=GetMousePresent
+EMouseX=ProcessMouseInfo
+EMouseY=ProcessMouseInfo
+EMouseButtons=ProcessMouseInfo
+EMouseState : set = ProcessMouseState
+EMouseSpeed : set = ProcessMouseSpeed
+EMouseAcceleration : set = ProcessMouseAcceleration
+EMouseButtonState=GetMouseButtonState
+ECaseState=0
+ECaseSwitch=0
+ECaseSwitchDisplayOn=ProcessCaseSwitchDisplayOnState
+ECaseSwitchDisplayOff=ProcessCaseSwitchDisplayOffState
+ELEDs=GetLedCaps
+ELEDmask : set = ProcessLEDMask
+ESwitches=GetSwitches
+EIntegratedPhone=0
+EDisplayBrightness : set = ProcessDisplayBrightness
+EDisplayBrightnessMax=ProcessDisplayMaxBrightness
+EKeyboardBacklightState=0
+ELanguageIndex : set = 0
+EKeyboardIndex : set = 0
+EMaxRAMDriveSize=0
+EDisplayIsMono=ProcessDisplaySpecifiedModeInfo
+EDisplayIsPalettized=ProcessDisplaySpecifiedModeInfo
+EDisplayBitsPerPixel=ProcessDisplaySpecifiedModeInfo
+EDisplayNumModes=ProcessDisplayNumModes
+EDisplayMemoryAddress=ProcessDisplayCurrentModeInfo
+EDisplayOffsetToFirstPixel=ProcessDisplaySpecifiedModeInfo
+EDisplayOffsetBetweenLines=ProcessDisplaySpecifiedModeInfo
+EDisplayPaletteEntry : set = ProcessDisplayPaletteEntry
+EDisplayIsPixelOrderRGB=ProcessDisplayCurrentModeInfo
+EDisplayIsPixelOrderLandscape=ProcessDisplayCurrentModeInfo
+EDisplayMode : set = ProcessDisplayMode
+EDebugPort : set = ProcessDebugPort
+ELocaleLoaded=0
+EClipboardDrive=0
+ECustomRestart : set = ProcessCustomRestart
+ECustomRestartReason=ProcessCustomRestartReason
+ESystemDrive : set = 0
+ENanoTickPeriod=0
+EFastCounterFrequency=0
+EFastCounterCountsUp=0
+EPersistStartupModeKernel : set = ProcessPersistStartupMode
+EMaximumCustomRestartReasons = GetMaximumCustomRestartReasons
+EMaximumRestartStartupModes = GetMaximumRestartStartupModes
+ECustomResourceDrive : set = 0
+EDisplayNumberOfScreens=0
+EHardwareFloatingPoint = GetHardwareFloatingPoint
+

--- a/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp	Wed Nov 17 11:02:10 2010 +0000
@@ -19,7 +19,7 @@
 
 #include "locmedia.h"
 #include "platform.h"
-#include "/sf/adapt/beagleboard/omap3530/beagleboard/inc/variantmediadef.h"
+#include "variantmediadef.h"
 #include "beagle_medstaticrd.h"
 //#include "syborg.h"
 

--- a/omap3530/beagle_drivers/medstaticrd/medstaticrd.mmp	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagle_drivers/medstaticrd/medstaticrd.mmp	Wed Nov 17 11:02:10 2010 +0000
@@ -27,6 +27,7 @@
 systeminclude		+/include/drivers
 SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 SYSTEMINCLUDE	AsspNKernIncludePath
+USERINCLUDE ../../beagleboard/inc
 
 SOURCEPATH		.
 SOURCE			beagle_medstaticrd.cpp

--- a/omap3530/beagleboard/rom/base_beagle.iby	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Wed Nov 17 11:02:10 2010 +0000
@@ -148,7 +148,9 @@
 
 //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll	\sys\bin\ekeyb.dll
 
+#ifndef GCCE
 // VFP support
 extension[VARID]= \epoc32\release\ARMV5\BUILD_DIR\EVFP.DLL	\sys\bin\evfp.dll
+#endif
 
-#endif
\ No newline at end of file
+#endif

--- a/omap3530/beagleboard/rom/header.iby	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagleboard/rom/header.iby	Wed Nov 17 11:02:10 2010 +0000
@@ -65,4 +65,7 @@
 unicode
 #endif
 
+#ifndef GCCE
 #define VFPHELPERS
+#endif
+

--- a/omap3530/beagleboard/rom/kernel.iby	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/beagleboard/rom/kernel.iby	Wed Nov 17 11:02:10 2010 +0000
@@ -88,8 +88,10 @@
 
 #define	EUSER_DLL	../../ARMV5/##BUILD##/_omap3530_euser.dll
 
+#ifndef GCCE
 // VFP support
 extension[VARID]= \Epoc32\Release\##KMAIN##\##BUILD##\EVFP.DLL \sys\bin\evfp.dll
+#endif
 
 #ifdef TEST_ROM
 #include <rom\##VARIANT##\test.iby>

--- a/omap3530/bld.inf	Tue Nov 16 13:53:39 2010 +0000
+++ b/omap3530/bld.inf	Wed Nov 17 11:02:10 2010 +0000
@@ -42,6 +42,12 @@
 // Build image armv5 for urel and udeb
 PRJ_EXTENSIONS
 start	extension	base/rom
+#ifdef ARMCC
+option ROM_DEFS ARMCC
+#endif
+#ifdef GCCE
+option ROM_DEFS GCCE
+#endif
 option	REE_TARGET	beagle
 option	TYPE	tshell
 end