Skip to content

Commit

Permalink
Merge branch 'main' into nrfx-2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marbre authored Oct 24, 2023
2 parents f36873f + 1e52dc2 commit 603400d
Show file tree
Hide file tree
Showing 7 changed files with 1,010 additions and 1 deletion.
26 changes: 26 additions & 0 deletions LICENSES/BSD-3-Clause.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright (c) <year> <owner>.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11 changes: 11 additions & 0 deletions LICENSES/LicenseRef-nrf_common.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
* Copyright (c) 2007, 2008, 2009, 2010 CodeSourcery, Inc.
*
* The authors hereby grant permission to use, copy, modify, distribute,
* and license this software and its documentation for any purpose, provided
* that existing copyright notices are retained in all copies and that this
* notice is included verbatim in any distributions. No written agreement,
* license, or royalty fee is required for any of the authorized uses.
* Modifications to this software may be copyrighted by their authors
* and need not follow the licensing terms described here, provided that
* the new terms are clearly indicated on the first page of each file where
* they apply.
2 changes: 1 addition & 1 deletion third_party/cmsis_device_f4
13 changes: 13 additions & 0 deletions third_party/nrfx-custom/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!--
SPDX-FileCopyrightText: 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
SPDX-License-Identifier: BSD-3-Clause
-->
# nrfx

This folder contains a subset of files imported from [NordicSemiconductor/nrfx](https://github.com/NordicSemiconductor/nrfx).

- The [`nrf52840_xxaa.ld`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/mdk/nrf52840_xxaa.ld) linker script was imported at state NordicSemiconductor/nrfx@7ef620b.

- The file [`nrf_common.ld`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/mdk/nrf_common.ld) was imported at state NordicSemiconductor/nrfx@7ef620b.

- The file [`gcc_startup_nrf52840.S`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/mdk/gcc_startup_nrf52840.S) was imported at state NordicSemiconductor/nrfx@7ef620b.
Loading

0 comments on commit 603400d

Please sign in to comment.