This commit was manufactured by cvs2git to create tag 'BuildSys-6_71'.

Sprout from master 2015-08-11 19:32:15 UTC Robert Sprowson <rsprowson@gitlab.riscosopen.org> 'Add AcornURI to the disc image'
Cherrypick from master 2014-04-26 12:12:45 UTC Jeffrey Lee <jlee@gitlab.riscosopen.org> 'Reintroduce SDCMOS to OMAP ROMs':
    Components/ROOL/IOMD32
    Components/ROOL/OMAP3
    Components/ROOL/OMAP4
    Components/ROOL/Tungsten

Components/ROOL/IOMD32

@@ -50,8 +50,6 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
-FPEmulator            -options FPE_APCS=3/32bit
-ScreenModes
 VIDC20Video
 Mouse
 PS2Driver
@@ -76,6 +74,7 @@ Filer
 FilerSWIs
 FSLock
 FontManager
+FPEmulator            -options FPE_APCS=3/32bit
 Free
 Hourglass
 IIC
@@ -119,6 +118,7 @@ SharedSnd
 Filer_Action
 DOSFS                 -options PCMCIA=TRUE
 ColourPicker
+ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

Components/ROOL/OMAP3

@@ -51,9 +51,7 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
-FPEmulator            -options FPE_APCS=3/32bit FPEANCHOR=High
-ScreenModes
-OMAPVideo             -options OMAP=3
+OMAPVideo             -options CDEFINES="-DOMAP=3"
 BASIC105
 BASIC64
 BlendTable
@@ -67,7 +65,6 @@ RTSupport
 USBDriver
 EHCIDriver
 MUSBDriver
-PandoraKey
 DisplayManager
 DMAManager
 DragASprite
@@ -81,6 +78,7 @@ Filer
 FilerSWIs
 FSLock
 FontManager           
+FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free
 Hourglass
@@ -133,6 +131,7 @@ SDFS
 SDFSFiler             -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
 SDCMOS
 ColourPicker
+ScreenModes
 DrawFile
 BootCommands
 AUNMsgs
@@ -185,6 +184,7 @@ CDFS
 CDFSFiler
 
 UnSqzAIF
+PandoraKey
 BatMgrHAL
 InetRes               -options TYPE=EmergencyUtils
 

Components/ROOL/OMAP4

@@ -50,9 +50,7 @@ TaskManager
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
-FPEmulator            -options FPE_APCS=3/32bit FPEANCHOR=High
-ScreenModes
-OMAPVideo             -options OMAP=4
+OMAPVideo             -options CDEFINES="-DOMAP=4"
 BASIC105
 BASIC64
 BlendTable
@@ -79,6 +77,7 @@ Filer
 FilerSWIs
 FSLock
 FontManager           
+FPEmulator            -options FPE_APCS=3/32bit
 VFPSupport
 Free
 Hourglass
@@ -131,6 +130,7 @@ SDFS
 SDFSFiler             -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
 SDCMOS
 ColourPicker
+ScreenModes
 DrawFile
 BootCommands
 AUNMsgs

Components/ROOL/Tungsten

@@ -50,8 +50,6 @@ WindowManager         -options OPTIONS=Ursula
 # Desktop is the 11th module (default language)
 Desktop
 SharedRISC_OSLib
-FPEmulator            -options FPE_APCS=3/32bit FPEANCHOR=High
-ScreenModes
 NVidia                
 TaskManager
 ADFSFiler
@@ -80,6 +78,7 @@ Filer
 FilerSWIs
 FSLock
 FontManager
+FPEmulator            -options FPE_APCS=3/32bit
 Free
 Hourglass
 IIC
@@ -127,6 +126,7 @@ SCSISoftUSB
 SCSIFS
 SCSIFiler             -options ASFLAGS="-PD \"SCSI SETL {TRUE}\"" TEMPLATES=no
 ColourPicker
+ScreenModes
 DrawFile
 BootCommands
 AUNMsgs