Skip to content

Commit 40baddf

Browse files
ilg-ulilg-ul
committed
#531: update for consistency with risc-v
1 parent ad087f9 commit 40baddf

File tree

4 files changed

+85
-120
lines changed

4 files changed

+85
-120
lines changed

‎plugins/org.eclipse.embedcdt.templates.xpack.ui/plugin.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
<extension point="org.eclipse.cdt.core.templates">
1818
<template
1919
filterPattern=".*g[c\+][c\+]"
20-
id="org.eclipse.embedcdt.templates.xpack.ui.hello.world.qemu.project"
20+
id="org.eclipse.embedcdt.templates.xpack.ui.hello.world.arm.qemu.project"
2121
location="$nl$/templates/hello-world-arm-qemu-xpack-project/template.xml"
2222
projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
2323
</template>
2424
</extension>
2525
<extension point="org.eclipse.cdt.core.templateAssociations">
26-
<template id="org.eclipse.embedcdt.templates.xpack.ui.hello.world.qemu.project">
26+
<template id="org.eclipse.embedcdt.templates.xpack.ui.hello.world.arm.qemu.project">
2727
<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base">
2828
</toolChain>
2929
</template>

‎plugins/org.eclipse.embedcdt.templates.xpack.ui/templates/hello-world-arm-qemu-xpack-project/qemu-liquid.launch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
{% if HWcore == 'cortex-m7f' %}
2+
{% if HWcoreArm == 'cortex-m7f' %}
33
<launchConfiguration type="ilg.gnumcueclipse.debug.gdbjtag.qemu.arm.launchConfigurationType">
44
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.architecture" value="arm"/>
55
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerExecutable" value="${qemu_arm_path}/${qemu_arm_executable}"/>
66
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuCpuName" value="cortex-m7"/>
77
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuMachineName" value="mps2-an500"/>
88
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.semihosting.cmdline" value="{{ projectName }} M7F"/>
99
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.doDebugInRam" value="false"/>
10-
{% elsif HWcore == 'cortex-m0' %}
10+
{% elsif HWcoreArm == 'cortex-m0' %}
1111
<launchConfiguration type="ilg.gnumcueclipse.debug.gdbjtag.qemu.arm.launchConfigurationType">
1212
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.architecture" value="arm"/>
1313
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerExecutable" value="${qemu_arm_path}/${qemu_arm_executable}"/>
1414
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuCpuName" value="cortex-m3"/>
1515
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuMachineName" value="mps2-an385"/>
1616
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.semihosting.cmdline" value="{{ projectName }} M0"/>
1717
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.doDebugInRam" value="false"/>
18-
{% elsif HWcore == 'cortex-a15' %}
18+
{% elsif HWcoreArm == 'cortex-a15' %}
1919
<launchConfiguration type="ilg.gnumcueclipse.debug.gdbjtag.qemu.arm.launchConfigurationType">
2020
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.architecture" value="arm"/>
2121
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerExecutable" value="${qemu_arm_path}/${qemu_arm_executable}"/>
2222
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuCpuName" value="cortex-a15"/>
2323
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerQemuMachineName" value="virt"/>
2424
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.semihosting.cmdline" value="{{ projectName }} A15"/>
2525
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.doDebugInRam" value="true"/>
26-
{% elsif HWcore == 'cortex-a72' %}
26+
{% elsif HWcoreArm == 'cortex-a72' %}
2727
<launchConfiguration type="ilg.gnumcueclipse.debug.gdbjtag.qemu.aarch64.launchConfigurationType">
2828
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.architecture" value="aarch64"/>
2929
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.qemu.gdbServerExecutable" value="${qemu_aarch64_path}/${qemu_aarch64_executable}"/>

‎plugins/org.eclipse.embedcdt.templates.xpack.ui/templates/hello-world-arm-qemu-xpack-project/template.properties‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,32 @@
1313
###############################################################################
1414

1515
#Template Default Values
16-
HW.template.label=Hello World Arm QEMU xPack C/C++ Project
17-
HW.template.description=A managed C/C++ project running \
16+
HW.template.arm.label=Hello World Arm QEMU xPack C/C++ Project
17+
HW.template.arm.description=A managed C/C++ project running \
1818
on QEMU emulated Arm processors.
1919

2020
# Used to configure the target wizard
21-
HW.group.target.label=Project settings
22-
HW.group.target.description=Select the CPU and define project options.
21+
HW.group.target.arm.label=Project settings
22+
HW.group.target.arm.description=Select the CPU and define project options.
2323

24-
HWcore.label=MCU:
25-
HWcore.description=The MCU, like Cortex-M7
24+
HWcore.arm.label=MCU:
25+
HWcore.arm.description=The MCU, like Cortex-M7
2626

27-
# Common definitions
28-
syscalls.label=Use system calls:
29-
syscalls.description=Control how system calls are implemented.
27+
someWarnings.arm.label=Check some warnings
28+
someWarnings.arm.description=Enable -Wall and -Wextra.
3029

31-
trace.label=Trace output:
32-
trace.description=Control where the trace output messages are forwarded.
30+
mostWarnings.arm.label=Check most warnings
31+
mostWarnings.arm.description=Enable as many warnings as possible.
3332

34-
someWarnings.label=Check some warnings
35-
someWarnings.description=Enable -Wall and -Wextra.
33+
useWerror.arm.label=Enable -Werror
34+
useWerror.arm.description=Instruct the compiler to stop on warnings.
3635

37-
mostWarnings.label=Check most warnings
38-
mostWarnings.description=Enable as many warnings as possible.
36+
doNotUseExceptions.arm.label=Do not use exceptions
37+
doNotUseExceptions.arm.descriptions=Do not use exceptions and RTTI
3938

40-
useWerror.label=Enable -Werror
41-
useWerror.description=Instruct the compiler to stop on warnings.
39+
useOg.arm.label=Use -Og on debug
40+
useOg.arm.description=Use the new optimization flag for the debug configurations.
4241

43-
doNotUseExceptions.label=Do not use exceptions
44-
doNotUseExceptions.descriptions=Do not use exceptions and RTTI
45-
46-
useOg.label=Use -Og on debug
47-
useOg.description=Use the new optimization flag for the debug configurations.
48-
49-
useNano.label=Use newlib nano
50-
useNano.description=Use the size optimised version of newlib.
42+
useNano.arm.label=Use newlib nano
43+
useNano.arm.description=Use the size optimised version of newlib.
5144

0 commit comments

Comments
 (0)