lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[nrf][pca10040] fix platform incompatibilities

Browse Source 
When the nrf52xxx platform was changed to use the Nordic nrfx
libraries the pca10040 target was broken due to differences in
how the platform handled initialization.
This commit is contained in:
Eric Holland
2020-10-10 16:12:07 -04:00
parent e0487f9b48
commit 38dd509b27
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/nrf52xxx/init.c
View File

@@ -47,5 +47,7 @@ void platform_init(void) {
// Note: i2c_init will only instantiate an i2c device if proper defines // Note: i2c_init will only instantiate an i2c device if proper defines
// are set. See comments at top of i2c_master.c for more info. // are set. See comments at top of i2c_master.c for more info.
#if (NRFX_TWIM_ENABLED)
i2c_init(); i2c_init();
#endif
} }

2
target/nrf-pca10040/include/target/gpioconfig.h
View File

@@ -8,8 +8,6 @@
#ifndef __TARGET_GPIOCONFIG_H #ifndef __TARGET_GPIOCONFIG_H
#define __TARGET_GPIOCONFIG_H #define __TARGET_GPIOCONFIG_H
#include <platform/gpio.h>
#define GPIO_LED1 17 #define GPIO_LED1 17
#define GPIO_LED2 18 #define GPIO_LED2 18
#define GPIO_LED3 19 #define GPIO_LED3 19

3
target/nrf-pca10040/init.c
View File

@@ -10,8 +10,7 @@
#include <target.h> #include <target.h>
#include <lk/compiler.h> #include <lk/compiler.h>
#include <dev/gpio.h> #include <dev/gpio.h>
#include <platform/gpio.h> #include <platform/init.h>
#include <platform/nrf52.h>
#include <target/gpioconfig.h> #include <target/gpioconfig.h>
void target_early_init(void) { void target_early_init(void) {