diff --git a/build_tools/third_party/nrfx/CMakeLists.txt b/build_tools/third_party/nrfx/CMakeLists.txt index d66881b..d8086cf 100644 --- a/build_tools/third_party/nrfx/CMakeLists.txt +++ b/build_tools/third_party/nrfx/CMakeLists.txt @@ -117,7 +117,6 @@ target_include_directories(nrfx_uarte ${nrfx_DIR} ${nrfx_DIR}/drivers/include/ ${nrfx_DIR}/hal/ - ${nrfx_DIR}/templates/ ${nrfx_DIR}/mdk/ ${nrfx_DIR}/soc/ ) diff --git a/third_party/nrfx-custom/README.md b/third_party/nrfx-custom/README.md index 12226f4..fb65499 100644 --- a/third_party/nrfx-custom/README.md +++ b/third_party/nrfx-custom/README.md @@ -10,8 +10,6 @@ This folder contains a subset of files imported from [NordicSemiconductor/nrfx]( - The [`nrf5340_xxaa_application.ld`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/mdk/nrf5340_xxaa_application.ld) linker script was imported at state NordicSemiconductor/nrfx@7ef620b. -- The file [`nrfx.h`](https://github.com/NordicSemiconductor/nrfx/blob/1c721175f22dbb1bf125a570a427b53f810881bb/nrfx.h) was imported at state NordicSemiconductor/nrfx@1c72117. - - 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. diff --git a/third_party/nrfx-custom/nrfx.h b/third_party/nrfx-custom/nrfx.h deleted file mode 100644 index ff4f3f9..0000000 --- a/third_party/nrfx-custom/nrfx.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA - * Copyright 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - * - * 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. - */ - -#ifndef NRFX_H__ -#define NRFX_H__ - -#include -#include -#include -#undef NRFX_ATOMIC_FETCH_OR -#undef NRFX_ATOMIC_FETCH_AND -#undef nrfx_atomic_t -#include -#include -#include -#include - -#endif // NRFX_H__ diff --git a/third_party/nrfx-custom/nrfx_glue_nrf5340.h b/third_party/nrfx-custom/nrfx_glue_nrf5340.h deleted file mode 100644 index 670e93f..0000000 --- a/third_party/nrfx-custom/nrfx_glue_nrf5340.h +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. -// SPDX-License-Identifier: BSD-3-Clause - -#ifndef NRFX_GLUE_NRFX5340_H__ -#define NRFX_GLUE_NRFX5340_H__ - -// File providing macros as requested in `nrfx_glue.h`. - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#define nrfx_atomic_t nrfx_atomic_u32_t - -#define NRFX_ATOMIC_FETCH_OR(p_data, value) \ - nrfx_atomic_u32_fetch_or(p_data, value) - -#define NRFX_ATOMIC_FETCH_AND(p_data, value) \ - nrfx_atomic_u32_fetch_and(p_data, value) - -#ifdef __cplusplus -} -#endif - -#endif // NRFX_GLUE_NRFX5340_H__