You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/04/25 20:27:52 UTC
[GitHub] andrzej-kaczmarek closed pull request #1057: hw/mcu/nordic: Fix
nrfx configuration
andrzej-kaczmarek closed pull request #1057: hw/mcu/nordic: Fix nrfx configuration
URL: https://github.com/apache/mynewt-core/pull/1057
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/include/nrfx_config.h b/hw/mcu/nordic/include/nrfx_config.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx52840_config.h b/hw/mcu/nordic/nrf52xxx/include/nrfx52840_config.h
index d854194564..80c6399fce 100644
--- a/hw/mcu/nordic/nrf52xxx/include/nrfx52840_config.h
+++ b/hw/mcu/nordic/nrf52xxx/include/nrfx52840_config.h
@@ -1,5 +1,5 @@
-#ifndef NRFX_CONFIG_H__
-#define NRFX_CONFIG_H__
+#ifndef NRFX52840_CONFIG_H__
+#define NRFX52840_CONFIG_H__
#include "syscfg/syscfg.h"
@@ -66,4 +66,4 @@
#define NRFX_PWM3_ENABLED 1
#endif
-#endif // NRFX_CONFIG_H__
+#endif // NRFX52840_CONFIG_H__
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h b/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
index 308f29c68f..83749a0148 100644
--- a/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
+++ b/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
@@ -1,5 +1,5 @@
-#ifndef NRFX_CONFIG_H__
-#define NRFX_CONFIG_H__
+#ifndef NRFX52_CONFIG_H__
+#define NRFX52_CONFIG_H__
#include "syscfg/syscfg.h"
@@ -62,4 +62,4 @@
#define NRFX_PWM2_ENABLED 1
#endif
-#endif // NRFX_CONFIG_H__
+#endif // NRFX52_CONFIG_H__
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx_config.h b/hw/mcu/nordic/nrf52xxx/include/nrfx_config.h
index 35326ffede..180058a61d 100644
--- a/hw/mcu/nordic/nrf52xxx/include/nrfx_config.h
+++ b/hw/mcu/nordic/nrf52xxx/include/nrfx_config.h
@@ -5,6 +5,8 @@
#include "nrfx52_config.h"
#elif NRF52840_XXAA
#include "nrfx52840_config.h"
+#else
+#error Unsupported chip selected
#endif
#endif // NRFX_CONFIG_H__
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services