--- a/symbian4/single/sources_good.csv	Wed Sep 29 20:02:59 2010 +0100
+++ b/symbian4/single/sources_good.csv	Thu Sep 30 11:30:36 2010 +0100
@@ -2,6 +2,7 @@
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,tag,S4_LATESTGOOD,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/naviengine.nec/,/sf/adaptation/naviengine.nec,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/adaptation/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,S4_LATESTGOOD,layers.sysdef.xml

--- a/symbian4/single/sources_proposed.csv	Wed Sep 29 20:02:59 2010 +0100
+++ b/symbian4/single/sources_proposed.csv	Thu Sep 30 11:30:36 2010 +0100
@@ -1,6 +1,7 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adaptation/beagleboard,tag,S4_PROPOSED,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adaptation/codecs.aricent,tag,S4_PROPOSED,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/naviengine.nec/,/sf/adaptation/naviengine.nec,tag,S4_PROPOSED,
 http://developer.symbian.org/oss/FCL/sf/adapt/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,S4_PROPOSED,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adaptation/qemu,tag,S4_PROPOSED,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adaptation/stubs,tag,S4_PROPOSED,201036

--- a/symbian4/single/sysdefs/system_model.xml	Wed Sep 29 20:02:59 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Thu Sep 30 11:30:36 2010 +0100
@@ -193,6 +193,22 @@
 </component>
 </collection>
 </block>
+<block name="naviengine.nec" level="low" levels="hw-if" long-name="NaviEngine">
+<collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
+<component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" filter="sf_build" purpose="optional">
+<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb"/>
+</component>
+<component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" filter="sf_build" purpose="optional">
+<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb/single"/>
+</component>
+<component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" filter="sf_build" purpose="optional">
+<unit bldFile="adaptation/naviengine.nec/navienginebspflexible"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" filter="sf_build" purpose="optional">
+<unit bldFile="adaptation/naviengine.nec/navienginebootldr"/>
+</component>
+</collection>
+</block>
 <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
 <collection name="aricent_utilities" long-name="Aricent Utilities" level="util">
 <component name="ariprocessengine" long-name="Aricent Process Engine" introduced="^4" filter="sf_build" purpose="optional">
@@ -8721,28 +8737,6 @@
 </component>
 </collection>
 </block>
-<block name="techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3" long-name="Techview">
-<collection name="techviewplat" long-name="Techview Platform" level="services"/>
-<collection name="techviewui" long-name="Techview UI" level="ui"/>
-<collection name="tv_controlpanel" long-name="Control Panel" level="ui"/>
-<collection name="pimapps" long-name="PIM Apps" level="apps3"/>
-<collection name="securityapps" long-name="Security Apps" level="apps3"/>
-<collection name="utilityapps" long-name="Utility Apps" level="apps2"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
 </layer>
 </systemModel>
 </SystemDefinition>