Add nrfx config files to custom directory

Moving the nrfx config files allows a cleaner implementation of configuration changes and prepares for the use of a custom `nrfx_glue.h`.
iree-org · Jan 19, 2024 · 066d102 · 066d102
1 parent 6f3fd39
commit 066d102
Show file tree

Hide file tree

Showing 9 changed files with 3,952 additions and 46 deletions.
diff --git a/build_tools/third_party/nrfx/CMakeLists.txt b/build_tools/third_party/nrfx/CMakeLists.txt
@@ -77,11 +77,12 @@ target_sources(nrfx_uart
 
 target_include_directories(nrfx_uart
   PUBLIC
+    ${nrfx_custom_DIR}
     ${nrfx_DIR}
     ${nrfx_DIR}/drivers/include/
     ${nrfx_DIR}/hal/
-    ${nrfx_DIR}/templates/
     ${nrfx_DIR}/mdk/
+    ${nrfx_DIR}/soc/
 )
 
 if(USE_UART0)
@@ -117,7 +118,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
@@ -10,10 +10,20 @@ 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.
 
 - The file [`gcc_startup_nrf5340_application.S`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/mdk/gcc_startup_nrf5340_application.S) was imported at state NordicSemiconductor/nrfx@7ef620b.
+
+- The file [`nrfx_config_common.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_config_common.h) was imported at state NordicSemiconductor/nrfx@7ef620b.
+
+- The file [`nrfx_config_nrf5340_application.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_config_nrf5340_application.h) was imported at state NordicSemiconductor/nrfx@7ef620b.
+
+- The file [`nrfx_config_nrf52840.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_config_nrf52840.h) was imported at state NordicSemiconductor/nrfx@7ef620b.
+
+- The file [`nrfx_config.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_config.h) was imported at state NordicSemiconductor/nrfx@7ef620b and modified to exclude unsupported devices.
+
+- The file [`nrfx_glue.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_glue.h) was imported at state NordicSemiconductor/nrfx@7ef620b and implementations for necessary features were added.
+
+- The file [`nrfx_log.h`](https://github.com/NordicSemiconductor/nrfx/blob/7ef620bedd3fd41828e0f81523a1d08a986b8a0e/templates/nrfx_log.h) was imported at state NordicSemiconductor/nrfx@7ef620b.
diff --git a/third_party/nrfx-custom/nrfx.h → third_party/nrfx-custom/nrfx_config.h b/third_party/nrfx-custom/nrfx.h → third_party/nrfx-custom/nrfx_config.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
- * Copyright 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+ * Copyright (c) 2019 - 2023, Nordic Semiconductor ASA
+ * Copyright 2024 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
@@ -32,18 +32,16 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NRFX_H__
-#define NRFX_H__
+#ifndef NRFX_CONFIG_H__
+#define NRFX_CONFIG_H__
 
-#include <nrfx_config.h>
-#include <drivers/nrfx_common.h>
-#include <nrfx_glue.h>
-#undef NRFX_ATOMIC_FETCH_OR
-#undef NRFX_ATOMIC_FETCH_AND
-#undef nrfx_atomic_t
-#include <nrfx_glue_nrf5340.h>
-#include <hal/nrf_common.h>
-#include <haly/nrfy_common.h>
-#include <drivers/nrfx_errors.h>
+#include <nrfx_config_common.h>
+#if defined(NRF52840_XXAA)
+    #include <nrfx_config_nrf52840.h>
+#elif defined(NRF5340_XXAA_APPLICATION)
+    #include <nrfx_config_nrf5340_application.h>
+#else
+    #error "No config for device."
+#endif
 
-#endif // NRFX_H__
+#endif // NRFX_CONFIG_H__
diff --git a/third_party/nrfx-custom/nrfx_config_common.h b/third_party/nrfx-custom/nrfx_config_common.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 - 2023, Nordic Semiconductor ASA
+ * 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_CONFIG_COMMON_H__
+#define NRFX_CONFIG_COMMON_H__
+
+#ifndef NRFX_CONFIG_H__
+#error "This file should not be included directly. Include nrfx_config.h instead."
+#endif
+
+/** @brief Symbol specifying major version of the nrfx API to be used. */
+#ifndef NRFX_CONFIG_API_VER_MAJOR
+#define NRFX_CONFIG_API_VER_MAJOR 3
+#endif
+
+/** @brief Symbol specifying minor version of the nrfx API to be used. */
+#ifndef NRFX_CONFIG_API_VER_MINOR
+#define NRFX_CONFIG_API_VER_MINOR 0
+#endif
+
+/** @brief Symbol specifying micro version of the nrfx API to be used. */
+#ifndef NRFX_CONFIG_API_VER_MICRO
+#define NRFX_CONFIG_API_VER_MICRO 0
+#endif
+
+#endif /* NRFX_CONFIG_COMMON_H__ */