michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nordic_nrf: Remove unnecessary inclusions

Browse source 
This is a follow-up to commit 4be102f8e05a9fa12290d8209a8cb38569265478.

Inclusion of `<system_nrf*.>` from `soc.c` files is no longer needed
since `SystemInit()` is not called from those files.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2023-03-27 13:43:53 +02:00 • committed by Marti Bolivar
commit 399fa64e7e
4 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soc/arm/nordic_nrf/nrf51/soc.c
View file

@ -20,7 +20,6 @@
#include <soc/nrfx_coredep.h> #include <soc/nrfx_coredep.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#include <system_nrf51.h>
#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
LOG_MODULE_REGISTER(soc); LOG_MODULE_REGISTER(soc);

18
soc/arm/nordic_nrf/nrf52/soc.c
View file

@ -20,24 +20,6 @@
#include <soc/nrfx_coredep.h> #include <soc/nrfx_coredep.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#if defined(CONFIG_SOC_NRF52805)
#include <system_nrf52805.h>
#elif defined(CONFIG_SOC_NRF52810)
#include <system_nrf52810.h>
#elif defined(CONFIG_SOC_NRF52811)
#include <system_nrf52811.h>
#elif defined(CONFIG_SOC_NRF52820)
#include <system_nrf52820.h>
#elif defined(CONFIG_SOC_NRF52832)
#include <system_nrf52.h>
#elif defined(CONFIG_SOC_NRF52833)
#include <system_nrf52833.h>
#elif defined(CONFIG_SOC_NRF52840)
#include <system_nrf52840.h>
#else
#error "Unknown SoC."
#endif
#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
LOG_MODULE_REGISTER(soc); LOG_MODULE_REGISTER(soc);

8
soc/arm/nordic_nrf/nrf53/soc.c
View file

@ -38,14 +38,6 @@
#define PIN_XL1 0 #define PIN_XL1 0
#define PIN_XL2 1 #define PIN_XL2 1
#if defined(CONFIG_SOC_NRF5340_CPUAPP)
#include <system_nrf5340_application.h>
#elif defined(CONFIG_SOC_NRF5340_CPUNET)
#include <system_nrf5340_network.h>
#else
#error "Unknown nRF53 SoC."
#endif
#if defined(CONFIG_SOC_NRF_GPIO_FORWARDER_FOR_NRF5340) #if defined(CONFIG_SOC_NRF_GPIO_FORWARDER_FOR_NRF5340)
#define GPIOS_PSEL_BY_IDX(node_id, prop, idx) \ #define GPIOS_PSEL_BY_IDX(node_id, prop, idx) \
NRF_DT_GPIOS_TO_PSEL_BY_IDX(node_id, prop, idx), NRF_DT_GPIOS_TO_PSEL_BY_IDX(node_id, prop, idx),

6
soc/arm/nordic_nrf/nrf91/soc.c
View file

@ -19,12 +19,6 @@
#include <soc/nrfx_coredep.h> #include <soc/nrfx_coredep.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#if defined(CONFIG_SOC_NRF9160)
#include <system_nrf9160.h>
#else
#error "Unknown SoC."
#endif
#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
LOG_MODULE_REGISTER(soc); LOG_MODULE_REGISTER(soc);