diff -r ccb4f6b3db21 -r 8cb079868133 sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby	Tue Aug 31 16:29:05 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/sspluginsgsa.iby	Wed Sep 01 12:34:26 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -17,27 +17,45 @@
 #ifndef __SSPLUGINSGSA_IBY__
 #define __SSPLUGINSGSA_IBY__
 
+file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0000.dll		sys\bin\ssm.state.policy.0000.dll
 file=ABI_DIR\BUILD_DIR\ssm.state.policy.0001.dll		sys\bin\ssm.state.policy.0001.dll
+file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0002.dll		sys\bin\ssm.state.policy.0002.dll
+file=ABI_DIR\BUILD_DIR\ssm.state.policy.hw.0003.dll		sys\bin\ssm.state.policy.0003.dll
 
+// rsc files for the rom
+data=EPOCROOT##epoc32\data\z\private\2000d75b\startup\fallback\fallbacktosysstart_target.rsc		private\2000d75b\startup\fallback\fallbacktosysstart.rsc
 
 data=EPOCROOT##epoc32\data\z\private\2000d75b\normal\gsanormalcmdlist.rsc		private\2000d75b\normal\gsanormalcmdlist.rsc
-
-// If it is NCP image that is being made (_IMAGE_TYPE_NCP defined)then NCP ssm.state.policy is used. which 
-// is used for textshell mode only.
-#if defined(_IMAGE_TYPE_NCP)
-file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0000.dll		sys\bin\ssm.state.policy.0000.dll
-file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0002.dll		sys\bin\ssm.state.policy.0002.dll
-file=ABI_DIR\BUILD_DIR\ssm.refrence.state.policy.hw.0003.dll		sys\bin\ssm.state.policy.0003.dll
-
 data=EPOCROOT##epoc32\data\z\private\2000d75b\shutdown\gsashutdowncmdlist.rsc		private\2000d75b\shutdown\gsashutdowncmdlist.rsc
 data=EPOCROOT##epoc32\data\z\private\2000d75b\fail\gsafailcmdlist.rsc			private\2000d75b\fail\gsafailcmdlist.rsc
 
-#endif //_IMAGE_TYPE_NCP
 REM Simple startup configuration - install a single resource file 
 REM as the default "mode 0" file.
+REM Note this is a Techview specific way of including just the 
+REM SCL required in the ROM. Licensees are expected to include more 
+REM than one SCL in their devices.
 
+REM If _STARTUPMODE, _STARTUPMODE1, _STARTUPMODE2 etc. are defined
+REM then SysStart fallback should be used so no SCL rss files will be included
+REM thus forcing the startup policy to use 
 REM The macro for selecting SCL lists is _SSMSTARTUPMODE
 
+#if (defined(_STARTUPMODE) || \
+	defined(_STARTUPMODE0) || \
+	defined(_STARTUPMODE1) || \
+	defined(_STARTUPMODE2) || \
+	defined(_STARTUPMODE3) || \
+	defined(_STARTUPMODE4) || \
+	defined(_STARTUPMODE5) || \
+	defined(_STARTUPMODE8))
+
+REM SysStart startup mode defines found, using SysStart startup
+WARNING "Use _SSMSTARTUPMODE instead of _STARTUPMODE as it is deprecated."
+WARNING "_STARTUPMODE can only be used for testing fallback on SysStart by including sysstart.iby and sysstartconfig.iby in buildrom command " 
+
+#else
+
+REM No legacy SysStart startup mode defines found, using SSM startup
 #ifdef _SSMSTARTUPMODE
 
 define _2000D75B_MODE _SSMSTARTUPMODE
@@ -65,4 +83,6 @@
 
 #endif // SSMA_MINIMAL_BOOT
 
+#endif // Legacy SysStart mode defines not found
+
 #endif // __SSPLUGINSGSA_IBY__