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/10 22:39:49 UTC
[42/50] [abbrv] incubator-mynewt-core git commit: nrf52 bsps;
remove nrf52.cfg, use standard openocd target.
nrf52 bsps; remove nrf52.cfg, use standard openocd target.
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/60598d08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/60598d08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/60598d08
Branch: refs/heads/master
Commit: 60598d087d7c960856856bc9152c737f513e1077
Parents: d476d02
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Nov 9 17:39:04 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Nov 9 17:39:04 2016 -0800
----------------------------------------------------------------------
hw/bsp/arduino_primo_nrf52/arduino_primo.cfg | 24 +++++++--
hw/bsp/arduino_primo_nrf52/nrf52.cfg | 43 ----------------
hw/bsp/nrf51-blenano/nrf51.cfg | 60 -----------------------
hw/bsp/rb-nano2/nrf52.cfg | 41 ----------------
4 files changed, 19 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60598d08/hw/bsp/arduino_primo_nrf52/arduino_primo.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/arduino_primo.cfg b/hw/bsp/arduino_primo_nrf52/arduino_primo.cfg
index b3ba906..d0efb1d 100644
--- a/hw/bsp/arduino_primo_nrf52/arduino_primo.cfg
+++ b/hw/bsp/arduino_primo_nrf52/arduino_primo.cfg
@@ -1,6 +1,20 @@
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
source [find interface/cmsis-dap.cfg]
-source [find ./nrf52.cfg]
-
-
-
+source [find target/nrf52.cfg]
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60598d08/hw/bsp/arduino_primo_nrf52/nrf52.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/nrf52.cfg b/hw/bsp/arduino_primo_nrf52/nrf52.cfg
deleted file mode 100644
index 99dba23..0000000
--- a/hw/bsp/arduino_primo_nrf52/nrf52.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Nordic nRF52 series: ARM Cortex-M4 @ 64 MHz
-#
-
-source [find target/swj-dp.tcl]
-
-if { [info exists CHIPNAME] } {
- set _CHIPNAME $CHIPNAME
-} else {
- set _CHIPNAME nrf52
-}
-
-if { [info exists CPUTAPID] } {
- set _CPUTAPID $CPUTAPID
-} else {
- set _CPUTAPID 0x2ba01477
-}
-
-# Work-area is a space in RAM used for flash programming
-# By default use 16kB
-if { [info exists WORKAREASIZE] } {
- set _WORKAREASIZE $WORKAREASIZE
-} else {
- set _WORKAREASIZE 0x4000
-}
-
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
-
-flash bank $_CHIPNAME.flash nrf52 0x00000000 0 1 1 $_TARGETNAME
-flash bank $_CHIPNAME.uicr nrf52 0x10001000 0 1 1 $_TARGETNAME
-
-adapter_khz 10000
-
-if { ![using_hla] } {
- cortex_m reset_config sysresetreq
-}
-
-
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60598d08/hw/bsp/nrf51-blenano/nrf51.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51.cfg b/hw/bsp/nrf51-blenano/nrf51.cfg
deleted file mode 100644
index 280dd4f..0000000
--- a/hw/bsp/nrf51-blenano/nrf51.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# script for Nordic nRF51 series, a Cortex-M0 chip
-#
-
-source [find target/swj-dp.tcl]
-
-if { [info exists CHIPNAME] } {
- set _CHIPNAME $CHIPNAME
-} else {
- set _CHIPNAME nrf51
-}
-
-if { [info exists ENDIAN] } {
- set _ENDIAN $ENDIAN
-} else {
- set _ENDIAN little
-}
-
-# Work-area is a space in RAM used for flash programming
-# By default use 16kB
-if { [info exists WORKAREASIZE] } {
- set _WORKAREASIZE $WORKAREASIZE
-} else {
- set _WORKAREASIZE 0x4000
-}
-
-if { [info exists CPUTAPID] } {
- set _CPUTAPID $CPUTAPID
-} else {
- set _CPUTAPID 0x0bb11477
-}
-
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
-
-if {![using_hla]} {
- # The chip supports standard ARM/Cortex-M0 SYSRESETREQ signal
- cortex_m reset_config sysresetreq
-}
-
-flash bank $_CHIPNAME.flash nrf51 0x00000000 0 1 1 $_TARGETNAME
-flash bank $_CHIPNAME.uicr nrf51 0x10001000 0 1 1 $_TARGETNAME
-
-#
-# The chip should start up from internal 16Mhz RC, so setting adapter
-# clock to 1Mhz should be OK
-#
-adapter_khz 1000
-
-proc enable_all_ram {} {
- # nRF51822 Product Anomaly Notice (PAN) #16 explains that not all RAM banks
- # are reliably enabled after reset on some revisions (contrary to spec.) So after
- # resetting we enable all banks via the RAMON register
- mww 0x40000524 0xF
-}
-$_TARGETNAME configure -event reset-end { enable_all_ram }
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60598d08/hw/bsp/rb-nano2/nrf52.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/nrf52.cfg b/hw/bsp/rb-nano2/nrf52.cfg
deleted file mode 100644
index c4ba167..0000000
--- a/hw/bsp/rb-nano2/nrf52.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Nordic nRF52 series: ARM Cortex-M4 @ 64 MHz
-#
-
-source [find target/swj-dp.tcl]
-
-if { [info exists CHIPNAME] } {
- set _CHIPNAME $CHIPNAME
-} else {
- set _CHIPNAME nrf52
-}
-
-if { [info exists CPUTAPID] } {
- set _CPUTAPID $CPUTAPID
-} else {
- set _CPUTAPID 0x2ba01477
-}
-
-# Work-area is a space in RAM used for flash programming
-# By default use 16kB
-if { [info exists WORKAREASIZE] } {
- set _WORKAREASIZE $WORKAREASIZE
-} else {
- set _WORKAREASIZE 0x4000
-}
-
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
-
-flash bank $_CHIPNAME.flash nrf52 0x00000000 0 1 1 $_TARGETNAME
-flash bank $_CHIPNAME.uicr nrf52 0x10001000 0 1 1 $_TARGETNAME
-
-adapter_khz 10000
-
-if { ![using_hla] } {
- cortex_m reset_config sysresetreq
-}