equal
deleted
inserted
replaced
107 // Call the makefile to build the bootstrap |
107 // Call the makefile to build the bootstrap |
108 // |
108 // |
109 |
109 |
110 PRJ_EXTENSIONS |
110 PRJ_EXTENSIONS |
111 |
111 |
|
112 #if 0 // Removing changes associated with introduction of bootstrap.flm - see Bug 2149 |
112 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
113 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
113 |
114 |
114 start extension base.bootstrap bootstrap |
115 start extension base.bootstrap bootstrap |
|
116 |
115 |
117 |
116 option NAME _template_bootrom |
118 option NAME _template_bootrom |
117 option CPU arm |
119 option CPU arm |
118 option MEMMODEL Multiple |
120 option MEMMODEL Multiple |
119 option SOURCES ./bootstrap/template.s |
121 option SOURCES ./bootstrap/template.s |
122 option E32PATH ../../../kernel/eka/../. |
124 option E32PATH ../../../kernel/eka/../. |
123 |
125 |
124 end |
126 end |
125 |
127 |
126 #else // !SBSV2 |
128 #else // !SBSV2 |
|
129 #endif // more workaround - close the #ifdef SBSV2 here, to regain the other bit |
|
130 #endif // first part of workaround - close the #ifdef 0 |
|
131 |
127 |
132 |
128 start extension base/bootstrap bootstrap |
133 start extension base/bootstrap bootstrap |
129 |
134 |
130 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
135 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
131 option INC_PATH $(EPOCROOT)epoc32/include |
136 option INC_PATH $(EPOCROOT)epoc32/include |
141 option INCLUDES $(EXTENSION_ROOT)/config.inc |
146 option INCLUDES $(EXTENSION_ROOT)/config.inc |
142 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
147 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
143 |
148 |
144 end |
149 end |
145 |
150 |
|
151 #if 0 // second part of workaround - avoid dangling #endif |
146 #endif // !SBSV2 |
152 #endif // !SBSV2 |