Skip to content

Commit

Permalink
Merge branch 'release/v2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@valeros
valeros committed Jul 17, 2017
2 parents 57abe26 + 6748200 commit f294c2b
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 53 deletions.
41 changes: 33 additions & 8 deletions boards/efm32gg_stk3700.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,39 @@
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32GG990F1024",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32GG990F1024",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
41 changes: 33 additions & 8 deletions boards/efm32hg_stk3400.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,39 @@
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32HG322F64",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32HG322F64",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
41 changes: 33 additions & 8 deletions boards/efm32lg_stk3600.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,39 @@
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32LG990F256",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32LG990F256",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
41 changes: 33 additions & 8 deletions boards/efm32pg_stk3401.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,39 @@
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32PG1B200F256GM32",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32PG1B200F256GM32",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
41 changes: 33 additions & 8 deletions boards/efm32wg_stk3800.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,39 @@
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32WG990F256",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32WG990F256",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
43 changes: 34 additions & 9 deletions boards/efm32zg_stk3200.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,44 @@
"build": {
"cpu": "cortex-m0plus",
"f_cpu": "24000000L",
"mcu": "efm2zg222f32"
"mcu": "efm32zg222f32"
},
"debug": {
"tools": {
"jlink": {
"server": {
"package": "tool-openocd",
"executable": "bin/openocd",
"arguments": [
"-f", "scripts/board/efm32.cfg"
]
},
"onboard": true
"onboard": true,
"server": [
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32ZG222F32",
"-port", "2331"
],
"executable": "JLinkGDBServerCL.exe",
"system": [
"windows",
"windows_amd64",
"windows_x86"
]
},
{
"arguments": [
"-singlerun",
"-if", "SWD",
"-select", "USB",
"-device", "EFM32ZG222F32",
"-port", "2331"
],
"executable": "JLinkGDBServer",
"system": [
"darwin_x86_64",
"linux_i686",
"linux_x86_64"
]
}
]
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion builder/frameworks/mbed
Submodule mbed updated 1 files
+154 −300 mbed.py
2 changes: 2 additions & 0 deletions examples/mbed-events/platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ board = efm32lg_stk3600
platform = siliconlabsefm32
framework = mbed
board = efm32zg_stk3200
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT

[env:efm32pg_stk3401]
platform = siliconlabsefm32
framework = mbed
board = efm32pg_stk3401
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
6 changes: 3 additions & 3 deletions platform.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-siliconlabsefm32.git"
},
"version": "2.1.0",
"version": "2.2.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand All @@ -27,12 +27,12 @@
"packages": {
"toolchain-gccarmnoneeabi": {
"type": "toolchain",
"version": ">=1.40803.0,<1.40805.0"
"version": ">=1.60301.0"
},
"framework-mbed": {
"type": "framework",
"optional": true,
"version": "~3.142.0"
"version": "~4.146.0"
},
"tool-openocd": {
"type": "debugger",
Expand Down

0 comments on commit f294c2b

Please sign in to comment.