From 4676e5900b6744fb4fe0c85a1ba3233a19ae71b7 Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Thu, 11 May 2017 18:34:12 +0200 Subject: [PATCH] nrf5/bluetooth: Moving makefile include folder and source files of bluetooth driver, ble uart and ble module to main Makefile. --- nrf5/Makefile | 5 +++++ nrf5/bluetooth/bluetooth_common.mk | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nrf5/Makefile b/nrf5/Makefile index fa24ae0fb2..6d6f043635 100644 --- a/nrf5/Makefile +++ b/nrf5/Makefile @@ -54,7 +54,9 @@ INC += -I./hal INC += -I./hal/$(MCU_VARIANT) INC += -I./modules/machine INC += -I./modules/ubluepy +INC += -I./modules/ble INC += -I../lib/mp-readline +INC += -I./bluetooth NRF_DEFINES += -D$(MCU_VARIANT_UPPER) NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET @@ -127,6 +129,8 @@ SRC_C += \ pin_named_pins.c \ fatfs_port.c \ drivers/pwm.c \ + bluetooth/ble_drv.c \ + bluetooth/ble_uart.c \ DRIVERS_SRC_C += $(addprefix modules/,\ machine/modmachine.c \ @@ -155,6 +159,7 @@ DRIVERS_SRC_C += $(addprefix modules/,\ ubluepy/ubluepy_scan_entry.c \ music/modmusic.c \ music/musictunes.c \ + ble/modble.c \ ) #ifeq ($(SD), ) diff --git a/nrf5/bluetooth/bluetooth_common.mk b/nrf5/bluetooth/bluetooth_common.mk index 0c1b8fabf2..84999efef6 100644 --- a/nrf5/bluetooth/bluetooth_common.mk +++ b/nrf5/bluetooth/bluetooth_common.mk @@ -53,10 +53,3 @@ SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME) ifeq ($(shell test ! -e $(SOFTDEV_HEX) && echo -n no),no) $(error $(STACK_MISSING_ERROR)) endif - -INC += -I./bluetooth - -SRC_C += \ - bluetooth/modble.c \ - bluetooth/ble_drv.c \ - bluetooth/ble_uart.c