# HG changeset patch # User Simon Howkins # Date 1291037238 0 # Node ID d8dcdd4c8ab419a7e4192cca05453a346ff3b1ef # Parent 2c1b345d77c2cbeba6776b21170f1e3f00c7326c# Parent ad7caa8e9a624b16bf87696221ac1d1f457cf0e4 Merged bootstrp reversion from GCC_MERGE branch as it's affecting mainstream S^3 builds too diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/assp/inc/assp.mmh --- a/omap3530/assp/inc/assp.mmh Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/assp/inc/assp.mmh Mon Nov 29 13:27:18 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 diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagle_drivers/hal/bld.inf --- a/omap3530/beagle_drivers/hal/bld.inf Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/beagle_drivers/hal/bld.inf Mon Nov 29 13:27:18 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)/. diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagle_drivers/hal/config.hcf --- a/omap3530/beagle_drivers/hal/config.hcf Mon Nov 22 12:21:46 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 diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagle_drivers/hal/config_novfp.hcf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omap3530/beagle_drivers/hal/config_novfp.hcf Mon Nov 29 13:27:18 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 + diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagle_drivers/hal/config_vfp.hcf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omap3530/beagle_drivers/hal/config_vfp.hcf Mon Nov 29 13:27:18 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 + diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagleboard/bld.inf --- a/omap3530/beagleboard/bld.inf Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/beagleboard/bld.inf Mon Nov 29 13:27:18 2010 +0000 @@ -53,31 +53,6 @@ // update regarding these are changes associated with introduction of bootstrap.flm - see Bug 2149 // and bsptemplate/asspandvariant/template_variant/bld.inf for more info. -start extension base.bootstrap bootstrap -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -option INC_PATH /epoc32/include -#else -option INC_PATH /epoc32/include/platform -#endif -#ifdef GCCE -option GCCE GCCE -#endif -#ifdef ARMCC -option ARMCC ARMCC -#endif -option NAME _beagle_bootrom -option CPU arm -option MEMMODEL Multiple -option SOURCES ./bootstrap/beagle.s -option EXTRA_SRC_PATH ./bootstrap -option EXTRA_INC_PATH ./bootstrap -option INCLUDES ./bootstrap/config.inc -option E32PATH ../../../../os/kernelhwsrv/kernel - -end -// Workaround end - - start extension base/bootstrap #ifdef SYMBIAN_OLD_EXPORT_LOCATION diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagleboard/rom/base_beagle.iby --- a/omap3530/beagleboard/rom/base_beagle.iby Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/beagleboard/rom/base_beagle.iby Mon Nov 29 13:27:18 2010 +0000 @@ -30,30 +30,30 @@ #endif #ifndef _EABI -#ifdef _ARM4 -#define _EABI ARM4 +# ifdef _ARM4 +# define _EABI ARM4 ECHO Defaulting to ARM4 -#elif defined(_ARMV5) -#define _EABI ARMV5 +# elif defined(_ARMV5) +# define _EABI ARMV5 ECHO Defaulting to ARMV5 -#elif defined _X86GCC -#define _EABI x86gcc -#endif +# elif defined _X86GCC +# define _EABI x86gcc +# endif #endif -#ifdef _PLAT -#undef _EABI -#define _EABI _PLAT +# ifdef _PLAT +# undef _EABI +# define _EABI _PLAT ECHO Defaulting to _EABI -#endif +# endif -#ifdef _GCCE -#undef _EABI -#define _EABI GCCE -#elif defined(ABIV2) || defined(ABIv2) -#undef _EABI -#define _EABI ARMV5_ABIV2 -#endif +# ifdef _GCCE +# undef _EABI +# define _EABI GCCE +# elif defined(ABIV2) || defined(ABIv2) +# undef _EABI +# define _EABI ARMV5_ABIV2 +# endif #ifndef _KABI #define _KABI _EABI @@ -108,7 +108,7 @@ #include #endif #ifdef SYMBIAN_BASE_USE_GCE -// Use the new GCE compliant display driver +// Use the new GCE compliant display driver extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll \sys\bin\lcd.dll device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\display.ldd \sys\bin\display0.ldd #ifndef EXCLUDE_SERIALKEYBOARD @@ -150,7 +150,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 +#endif diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagleboard/rom/header.iby --- a/omap3530/beagleboard/rom/header.iby Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/beagleboard/rom/header.iby Mon Nov 29 13:27:18 2010 +0000 @@ -65,4 +65,7 @@ unicode #endif +#ifndef GCCE #define VFPHELPERS +#endif + diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/beagleboard/rom/kernel.iby --- a/omap3530/beagleboard/rom/kernel.iby Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/beagleboard/rom/kernel.iby Mon Nov 29 13:27:18 2010 +0000 @@ -96,8 +96,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 diff -r 2c1b345d77c2 -r d8dcdd4c8ab4 omap3530/bld.inf --- a/omap3530/bld.inf Mon Nov 22 12:21:46 2010 +0000 +++ b/omap3530/bld.inf Mon Nov 29 13:27:18 2010 +0000 @@ -43,6 +43,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