Revision 491:cfa88419c335, committed 2015-12-02

Comitter:

rgrover1

Date:

Wed Dec 02 10:31:32 2015 +0000

Parent:

490:ca9a6580741c

Child:

492:c03f54ed1607

Commit message:

Synchronized with git rev 9cbf98cb
Author: Rohit Grover
add Nordic's license agreement.
@note: we need the softdevice in this module because it is shared with mbed-classic. This is where the mbed-classic toolchain expects to find the SD.

Changed in this revision

--- a/LICENSE	Wed Dec 02 10:31:32 2015 +0000
+++ b/LICENSE	Wed Dec 02 10:31:32 2015 +0000
@@ -1,6 +1,9 @@
 Many of the files in this module have been inherited from the Nordic SDK for
-nRF51822; they come with a BSD-like license offered by Nordic for use in mbed.
-Some other files come from the mbed SDK, and are licensed under Apache-2.0.
-Unless specifically indicated otherwise in a file, files are licensed
-under the Apache 2.0 license, as can be found in: apache-2.0.txt.
-The BSD-like Nordic license can be found in BSD-3clause-Nordic.txt
\ No newline at end of file
+nRF51822. With the exception of the softdevice, they come with a BSD license
+offered by Nordic for use in mbed. The Nordic Softdevice License Agreement, a
+BSD-like licence for binary distributions, applies to the softdevice. Some
+other files come from the mbed SDK, and are licensed under Apache-2.0. Unless
+specifically indicated otherwise in a file, files are licensed under the
+Apache 2.0 license, as can be found in: apache-2.0.txt. The BSD-like Nordic
+license can be found in BSD-3clause-Nordic.txt. The Nordic Semiconductor Softdevice
+License Agreement can be found in softdevice_nrf51822_licence_agreement.txt.
\ No newline at end of file

--- a/module.json	Wed Dec 02 10:31:32 2015 +0000
+++ b/module.json	Wed Dec 02 10:31:32 2015 +0000
@@ -18,6 +18,9 @@
     {
       "url": "https://spdx.org/licenses/Apache-2.0",
       "type": "Apache-2.0"
+    },
+    {
+      "type": "LicenseRef-softdevice_nrf51822_licence_agreement.txt"
     }
   ],
   "dependencies": {