You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/09 22:46:09 UTC
[1/4] incubator-mynewt-core git commit: BSPs - Change rel. paths to
be rooted at repo dir.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 83129d438 -> a982ff62a
BSPs - Change rel. paths to be rooted at repo dir.
This commit accounts for the behavior change introduced in
dd34193d3c31c5d87161343f160981fb8833c23f in the newt repo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/a982ff62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/a982ff62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/a982ff62
Branch: refs/heads/develop
Commit: a982ff62a62952d66bc255a2317e31afb5de7076
Parents: f5c9980
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 14:44:41 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800
----------------------------------------------------------------------
hw/bsp/arduino_primo_nrf52/bsp.yml | 14 +++++++-------
hw/bsp/bmd300eval/bsp.yml | 12 ++++++------
hw/bsp/frdm-k64f/bsp.yml | 8 ++++----
hw/bsp/native/bsp.yml | 2 +-
hw/bsp/nrf51-arduino_101/bsp.yml | 12 ++++++------
hw/bsp/nrf51-blenano/bsp.yml | 12 ++++++------
hw/bsp/nrf51dk-16kbram/bsp.yml | 12 ++++++------
hw/bsp/nrf51dk/bsp.yml | 12 ++++++------
hw/bsp/nrf52dk/bsp.yml | 12 ++++++------
hw/bsp/nucleo-f401re/bsp.yml | 12 ++++++------
hw/bsp/olimex_stm32-e407_devboard/bsp.yml | 12 ++++++------
hw/bsp/rb-nano2/bsp.yml | 12 ++++++------
hw/bsp/stm32f4discovery/bsp.yml | 12 ++++++------
13 files changed, 72 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/arduino_primo_nrf52/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/bsp.yml b/hw/bsp/arduino_primo_nrf52/bsp.yml
index e5d2f2a..a24479b 100644
--- a/hw/bsp/arduino_primo_nrf52/bsp.yml
+++ b/hw/bsp/arduino_primo_nrf52/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/arduino_primo_nrf52/nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
-bsp.part2linkerscript: "split-primo.ld"
-bsp.downloadscript: primo_download.sh
-bsp.debugscript: primo_debug.sh
+ - "hw/bsp/arduino_primo_nrf52/boot-nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
+bsp.part2linkerscript: "hw/bsp/arduino_primo_nrf52/split-primo.ld"
+bsp.downloadscript: "hw/bsp/arduino_primo_nrf52/primo_download.sh"
+bsp.debugscript: "hw/bsp/arduino_primo_nrf52/primo_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/bmd300eval/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/bsp.yml b/hw/bsp/bmd300eval/bsp.yml
index 8a39786..98b1927 100644
--- a/hw/bsp/bmd300eval/bsp.yml
+++ b/hw/bsp/bmd300eval/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/bmd300eval/nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/bmd300eval/boot-nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.part2linkerscript: "split-bmd300eval.ld"
-bsp.downloadscript: bmd300eval_download.sh
-bsp.debugscript: bmd300eval_debug.sh
+bsp.downloadscript: "hw/bsp/bmd300eval/bmd300eval_download.sh"
+bsp.debugscript: "hw/bsp/bmd300eval/bmd300eval_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/frdm-k64f/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/frdm-k64f/bsp.yml b/hw/bsp/frdm-k64f/bsp.yml
index 10ed8e7..e1ef7d6 100644
--- a/hw/bsp/frdm-k64f/bsp.yml
+++ b/hw/bsp/frdm-k64f/bsp.yml
@@ -19,10 +19,10 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
-bsp.linkerscript: "MK64FN1M0xxx12_flash.ld"
-bsp.linkerscript.BOOT_LOADER.OVERWRITE: "boot-MK64FN1M0xxx12_flash.ld"
-bsp.downloadscript: frdm-k64_download.sh
-bsp.debugscript: frdm-k64_debug.sh
+bsp.linkerscript: "hw/bsp/frdm-k64f/MK64FN1M0xxx12_flash.ld"
+bsp.linkerscript.BOOT_LOADER.OVERWRITE: "hw/bsp/frdm-k64f/boot-MK64FN1M0xxx12_flash.ld"
+bsp.downloadscript: "hw/bsp/frdm-k64f/frdm-k64_download.sh"
+bsp.debugscript: "hw/bsp/frdm-k64f/frdm-k64_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/native/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/native/bsp.yml b/hw/bsp/native/bsp.yml
index 30ca687..4311cf7 100644
--- a/hw/bsp/native/bsp.yml
+++ b/hw/bsp/native/bsp.yml
@@ -19,7 +19,7 @@
bsp.arch: sim
bsp.compiler: compiler/sim
-bsp.debugscript: "native_debug.sh"
+bsp.debugscript: "hw/bsp/native/native_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nrf51-arduino_101/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/bsp.yml b/hw/bsp/nrf51-arduino_101/bsp.yml
index 73c23bb..00ecf5c 100644
--- a/hw/bsp/nrf51-arduino_101/bsp.yml
+++ b/hw/bsp/nrf51-arduino_101/bsp.yml
@@ -20,13 +20,13 @@
bsp.arch: cortex_m0
bsp.compiler: compiler/arm-none-eabi-m0
bsp.linkerscript:
- - "nrf51xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51-arduino_101/nrf51xxaa.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf51xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
-bsp.downloadscript: nrf51dk-16kbram_download.sh
-bsp.debugscript: nrf51dk-16kbram_debug.sh
+ - "hw/bsp/nrf51-arduino_101/boot-nrf51xxaa.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
+bsp.downloadscript: "hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh"
+bsp.debugscript: "hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nrf51-blenano/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/bsp.yml b/hw/bsp/nrf51-blenano/bsp.yml
index c1bb248..f706c3c 100644
--- a/hw/bsp/nrf51-blenano/bsp.yml
+++ b/hw/bsp/nrf51-blenano/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m0
bsp.compiler: compiler/arm-none-eabi-m0
bsp.linkerscript:
- - "nrf51xxac.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51-blenano/nrf51xxac.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf51xxac.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51-blenano/boot-nrf51xxac.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.part2linkerscript: "split-nrf51dk.ld"
-bsp.downloadscript: nrf51dk_download.sh
-bsp.debugscript: nrf51dk_debug.sh
+bsp.downloadscript: "hw/bsp/nrf51-blenano/nrf51dk_download.sh"
+bsp.debugscript: "hw/bsp/nrf51-blenano/nrf51dk_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nrf51dk-16kbram/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/bsp.yml b/hw/bsp/nrf51dk-16kbram/bsp.yml
index 03b17bc..dd2abf3 100644
--- a/hw/bsp/nrf51dk-16kbram/bsp.yml
+++ b/hw/bsp/nrf51dk-16kbram/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m0
bsp.compiler: compiler/arm-none-eabi-m0
bsp.linkerscript:
- - "nrf51xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51dk-16kbram/nrf51xxaa.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf51xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51dk-16kbram/boot-nrf51xxaa.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.part2linkerscript: "split-nrf51dk-16kbram.ld"
-bsp.downloadscript: nrf51dk-16kbram_download.sh
-bsp.debugscript: nrf51dk-16kbram_debug.sh
+bsp.downloadscript: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh"
+bsp.debugscript: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nrf51dk/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/bsp.yml b/hw/bsp/nrf51dk/bsp.yml
index c1bb248..48d6792 100644
--- a/hw/bsp/nrf51dk/bsp.yml
+++ b/hw/bsp/nrf51dk/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m0
bsp.compiler: compiler/arm-none-eabi-m0
bsp.linkerscript:
- - "nrf51xxac.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51dk/nrf51xxac.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf51xxac.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
+ - "hw/bsp/nrf51dk/boot-nrf51xxac.ld"
+ - "hw/mcu/nordic/nrf51xxx/nrf51.ld"
bsp.part2linkerscript: "split-nrf51dk.ld"
-bsp.downloadscript: nrf51dk_download.sh
-bsp.debugscript: nrf51dk_debug.sh
+bsp.downloadscript: "hw/bsp/nrf51dk/nrf51dk_download.sh"
+bsp.debugscript: "hw/bsp/nrf51dk/nrf51dk_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nrf52dk/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/bsp.yml b/hw/bsp/nrf52dk/bsp.yml
index 312e102..83613fe 100644
--- a/hw/bsp/nrf52dk/bsp.yml
+++ b/hw/bsp/nrf52dk/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/nrf52dk/nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/nrf52dk/boot-nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.part2linkerscript: "split-nrf52dk.ld"
-bsp.downloadscript: nrf52dk_download.sh
-bsp.debugscript: nrf52dk_debug.sh
+bsp.downloadscript: "hw/bsp/nrf52dk/nrf52dk_download.sh"
+bsp.debugscript: "hw/bsp/nrf52dk/nrf52dk_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/nucleo-f401re/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nucleo-f401re/bsp.yml b/hw/bsp/nucleo-f401re/bsp.yml
index cd4a8c6..73313b8 100644
--- a/hw/bsp/nucleo-f401re/bsp.yml
+++ b/hw/bsp/nucleo-f401re/bsp.yml
@@ -20,13 +20,13 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "nucleo-f401re.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f401.ld"
+ - "hw/bsp/nucleo-f401re/nucleo-f401re.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f401.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nucleo-f401re.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f401.ld"
-bsp.downloadscript: "nucleo-f401re_download.sh"
-bsp.debugscript: "nucleo-f401re_debug.sh"
+ - "hw/bsp/nucleo-f401re/boot-nucleo-f401re.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f401.ld"
+bsp.downloadscript: "hw/bsp/nucleo-f401re/nucleo-f401re_download.sh"
+bsp.debugscript: "hw/bsp/nucleo-f401re/nucleo-f401re_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/olimex_stm32-e407_devboard/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/bsp.yml b/hw/bsp/olimex_stm32-e407_devboard/bsp.yml
index c623c75..62a7899 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/bsp.yml
+++ b/hw/bsp/olimex_stm32-e407_devboard/bsp.yml
@@ -20,13 +20,13 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "olimex_stm32-e407_devboard.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f407.ld"
+ - "hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f407.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-olimex_stm32-e407_devboard.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f407.ld"
-bsp.downloadscript: "olimex_stm32-e407_devboard_download.sh"
-bsp.debugscript: "olimex_stm32-e407_devboard_debug.sh"
+ - "hw/bsp/olimex_stm32-e407_devboard/boot-olimex_stm32-e407_devboard.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f407.ld"
+bsp.downloadscript: "hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh"
+bsp.debugscript: "hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/rb-nano2/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/bsp.yml b/hw/bsp/rb-nano2/bsp.yml
index 4b4f6fe..d461cb4 100644
--- a/hw/bsp/rb-nano2/bsp.yml
+++ b/hw/bsp/rb-nano2/bsp.yml
@@ -20,14 +20,14 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/rb-nano2/nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-nrf52xxaa.ld"
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
+ - "hw/bsp/rb-nano2/boot-nrf52xxaa.ld"
+ - "hw/mcu/nordic/nrf52xxx/nrf52.ld"
bsp.part2linkerscript: "split-rb-nano2.ld"
-bsp.downloadscript: rb-nano2_download.sh
-bsp.debugscript: rb-nano2_debug.sh
+bsp.downloadscript: "hw/bsp/rb-nano2/rb-nano2_download.sh"
+bsp.debugscript: "hw/bsp/rb-nano2/rb-nano2_debug.sh"
bsp.flash_map:
areas:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a982ff62/hw/bsp/stm32f4discovery/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/stm32f4discovery/bsp.yml b/hw/bsp/stm32f4discovery/bsp.yml
index cbfc1d4..2e50d60 100644
--- a/hw/bsp/stm32f4discovery/bsp.yml
+++ b/hw/bsp/stm32f4discovery/bsp.yml
@@ -20,13 +20,13 @@
bsp.arch: cortex_m4
bsp.compiler: compiler/arm-none-eabi-m4
bsp.linkerscript:
- - "stm32f4discovery.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f407.ld"
+ - "hw/bsp/stm32f4discovery/stm32f4discovery.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f407.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "boot-stm32f4discovery.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f4xx/stm32f407.ld"
-bsp.downloadscript: "stm32f4discovery_download.sh"
-bsp.debugscript: "stm32f4discovery_debug.sh"
+ - "hw/bsp/stm32f4discovery/boot-stm32f4discovery.ld"
+ - "hw/mcu/stm/stm32f4xx/stm32f407.ld"
+bsp.downloadscript: "hw/bsp/stm32f4discovery/stm32f4discovery_download.sh"
+bsp.debugscript: "hw/bsp/stm32f4discovery/stm32f4discovery_debug.sh"
bsp.flash_map:
areas:
[3/4] incubator-mynewt-core git commit: nrf51-blenano - Use OpenOCD's
cmsis-dap.cfg; not ours.
Posted by cc...@apache.org.
nrf51-blenano - Use OpenOCD's cmsis-dap.cfg; not ours.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/f5c99806
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f5c99806
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f5c99806
Branch: refs/heads/develop
Commit: f5c998062f7bec8075ae06f6c94a13fd179d50e5
Parents: c63a083
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 14:08:48 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800
----------------------------------------------------------------------
hw/bsp/nrf51-blenano/cmsis-dap.cfg | 12 ------------
hw/bsp/nrf51-blenano/nrf51dk_debug.sh | 2 +-
hw/bsp/nrf51-blenano/nrf51dk_download.sh | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/cmsis-dap.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/cmsis-dap.cfg b/hw/bsp/nrf51-blenano/cmsis-dap.cfg
deleted file mode 100644
index 7251280..0000000
--- a/hw/bsp/nrf51-blenano/cmsis-dap.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# ARM CMSIS-DAP compliant adapter
-#
-# http://www.keil.com/support/man/docs/dapdebug/
-#
-
-interface cmsis-dap
-
-#set WORKAREASIZE 0x2000
-
-# Optionally specify the serial number of CMSIS-DAP usb device.
-#cmsis_dap_serial 02200201E6661E601B98E3B9
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51dk_debug.sh b/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
index 4ca9760..10e8408 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
@@ -30,7 +30,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
FILE_NAME=$BIN_BASENAME.elf
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf51.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf51.cfg"
EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; nrf51.cpu configure -event gdb-detach {resume;shutdown}"
openocd_debug
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51dk_download.sh b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
index af3f7bd..1f1d5de 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_download.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
@@ -31,7 +31,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf51.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf51.cfg"
if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0
[4/4] incubator-mynewt-core git commit: eventq - Add some comments.
Posted by cc...@apache.org.
eventq - Add some comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/7ad9747d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/7ad9747d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/7ad9747d
Branch: refs/heads/develop
Commit: 7ad9747dacde6c8a07305edf8ea04c7db8178f92
Parents: 83129d4
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 10:22:26 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800
----------------------------------------------------------------------
kernel/os/src/os_eventq.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7ad9747d/kernel/os/src/os_eventq.c
----------------------------------------------------------------------
diff --git a/kernel/os/src/os_eventq.c b/kernel/os/src/os_eventq.c
index 3d79533..5c020c0 100644
--- a/kernel/os/src/os_eventq.c
+++ b/kernel/os/src/os_eventq.c
@@ -260,12 +260,26 @@ os_eventq_remove(struct os_eventq *evq, struct os_event *ev)
OS_EXIT_CRITICAL(sr);
}
+/**
+ * Assigns the default event queue. Packages which require an event queue, and
+ * which haven't been explicitly told which one to use, will use this one
+ * automatically.
+ *
+ * @param evq The event queue to designate as the default.
+ */
void
os_eventq_dflt_set(struct os_eventq *evq)
{
os_eventq_main = evq;
}
+/**
+ * Retrieves the default event queue, if any. The default event queue is
+ * designated via a call to os_eventq_dflt_set().
+ *
+ * @return The default event queue, no NULL if there isn't
+ * any.
+ */
struct os_eventq *
os_eventq_dflt_get(void)
{
[2/4] incubator-mynewt-core git commit: rb-nano2 - Use OpenOCD's
cmsis-dap.cfg; not ours.
Posted by cc...@apache.org.
rb-nano2 - Use OpenOCD's cmsis-dap.cfg; not ours.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c63a0831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c63a0831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c63a0831
Branch: refs/heads/develop
Commit: c63a083158b07b75143b2b88cf9acf24713b89c6
Parents: 7ad9747
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 14:02:29 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800
----------------------------------------------------------------------
hw/bsp/rb-nano2/cmsis-dap.cfg | 12 ------------
hw/bsp/rb-nano2/rb-nano2_debug.sh | 2 +-
hw/bsp/rb-nano2/rb-nano2_download.sh | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c63a0831/hw/bsp/rb-nano2/cmsis-dap.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/cmsis-dap.cfg b/hw/bsp/rb-nano2/cmsis-dap.cfg
deleted file mode 100644
index 7251280..0000000
--- a/hw/bsp/rb-nano2/cmsis-dap.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# ARM CMSIS-DAP compliant adapter
-#
-# http://www.keil.com/support/man/docs/dapdebug/
-#
-
-interface cmsis-dap
-
-#set WORKAREASIZE 0x2000
-
-# Optionally specify the serial number of CMSIS-DAP usb device.
-#cmsis_dap_serial 02200201E6661E601B98E3B9
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c63a0831/hw/bsp/rb-nano2/rb-nano2_debug.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/rb-nano2_debug.sh b/hw/bsp/rb-nano2/rb-nano2_debug.sh
index 4ac2d94..8cd53c8 100755
--- a/hw/bsp/rb-nano2/rb-nano2_debug.sh
+++ b/hw/bsp/rb-nano2/rb-nano2_debug.sh
@@ -30,7 +30,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
FILE_NAME=$BIN_BASENAME.elf
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf52.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf52.cfg"
EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; nrf52.cpu configure -event gdb-detach {resume;shutdown}"
openocd_debug
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c63a0831/hw/bsp/rb-nano2/rb-nano2_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/rb-nano2_download.sh b/hw/bsp/rb-nano2/rb-nano2_download.sh
index f027618..d772862 100755
--- a/hw/bsp/rb-nano2/rb-nano2_download.sh
+++ b/hw/bsp/rb-nano2/rb-nano2_download.sh
@@ -31,7 +31,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf52.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf52.cfg"
if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0