Skip to content

Commit e4ffcbe

Browse files
committed
change scatter file path placeholder
1 parent 770734b commit e4ffcbe

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/CodeBuilder.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,9 +889,6 @@ export class ARMCodeBuilder extends CodeBuilder {
889889
const ldFileList: string[] = [];
890890

891891
let scatterFilePath: string = config.compileConfig.scatterFilePath;
892-
if (scatterFilePath == 'undefined') {
893-
scatterFilePath = `${scatterFilePath}.sct`;
894-
}
895892

896893
switch (toolchain.name) {
897894
// 'armcc' can select whether use custom linker file

src/EIDEProjectModules.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ export abstract class ArmBaseCompileConfigModel
854854
cpuType: 'Cortex-M3',
855855
floatingPointHardware: 'none',
856856
useCustomScatterFile: false,
857-
scatterFilePath: 'undefined',
857+
scatterFilePath: '<YOUR_SCATTER_FILE>.sct',
858858
storageLayout: {
859859
RAM: [
860860
{
@@ -988,7 +988,7 @@ export class GccCompileConfigModel extends ArmBaseCompileConfigModel {
988988
return {
989989
cpuType: 'Cortex-M3',
990990
floatingPointHardware: 'none',
991-
scatterFilePath: 'undefined.lds',
991+
scatterFilePath: '<YOUR_LINKER_SCRIPT>.lds',
992992
useCustomScatterFile: true,
993993
storageLayout: { RAM: [], ROM: [] },
994994
options: 'null'
@@ -1043,7 +1043,7 @@ class IarArmCompileConfigModel extends ArmBaseCompileConfigModel {
10431043
return {
10441044
cpuType: 'Cortex-M3',
10451045
floatingPointHardware: 'none',
1046-
scatterFilePath: '${ToolchainRoot}/config/linker/ST/stm32f103x8.icf',
1046+
scatterFilePath: '${ToolchainRoot}/config/<YOUR_LINKER_CFG>.icf',
10471047
useCustomScatterFile: true,
10481048
storageLayout: { RAM: [], ROM: [] },
10491049
options: 'null'

0 commit comments

Comments
 (0)