Revision: 201017 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 27 Apr 2010 17:48:57 +0300
branchRCL_3
changeset 6 5e522efbae7b
parent 5 d90029decf65
child 8 5e76a11e104b
Revision: 201017 Kit: 201017
sbsv1_os/e32toolp/makmake/mmp.pm
--- a/sbsv1_os/e32toolp/makmake/mmp.pm	Wed Apr 14 17:09:28 2010 +0300
+++ b/sbsv1_os/e32toolp/makmake/mmp.pm	Tue Apr 27 17:48:57 2010 +0300
@@ -1706,14 +1706,19 @@
 			next LINE;
 		}
 		if( /^PAGED$/o) {
-			if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+			if ($CodePagingTargetMode == PAGED) {
 				push @MmpWarn, "$CurFile($LineNum) : duplicate paging setting\n";
 			}
-			if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+			if ($CodePagingTargetMode == UNPAGED) {
 				push @MmpWarn, "$CurFile($LineNum) : conflict paging setting\n";
 			}
 			$CodePagingTargetMode = PAGED;
-			$DataPagingTargetMode = PAGED;
+			#revert "PAGED" keyword from code and data paged to code paged only
+			#$DataPagingTargetMode = PAGED;
 			next LINE;
 			}
 		if( /^UNPAGED$/o) {