From aa24fbf26e3ff7c201bd6032030f47b49c6be5f5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 4 Sep 2015 10:40:11 +0100 Subject: tidy up makefile and remove unecessary forked code --- Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 95e37d1..192bdde 100644 --- a/Makefile +++ b/Makefile @@ -22,27 +22,28 @@ BDADDR=FD:F9:62:4A:8A:C8 SDKCSRCS= \ - libraries/util/app_error.c \ - libraries/scheduler/app_scheduler.c \ - libraries/timer/app_timer.c \ - libraries/timer/app_timer_appsh.c \ + ble/ble_services/ble_dfu/ble_dfu.c \ + ble/common/ble_advdata.c \ + ble/common/ble_conn_params.c \ + ble/common/ble_srv_common.c \ + drivers_nrf/hal/nrf_delay.c \ + drivers_nrf/pstorage/pstorage_raw.c \ + libraries/crc16/crc16.c \ libraries/bootloader_dfu/bootloader.c \ libraries/bootloader_dfu/bootloader_settings.c \ libraries/bootloader_dfu/bootloader_util.c \ - libraries/bootloader_dfu/dfu_single_bank.c \ - libraries/crc16/crc16.c \ libraries/bootloader_dfu/dfu_init_template.c \ + libraries/bootloader_dfu/dfu_single_bank.c \ + libraries/bootloader_dfu/dfu_transport_ble.c \ libraries/hci/hci_mem_pool.c \ + libraries/scheduler/app_scheduler.c \ + libraries/timer/app_timer.c \ + libraries/timer/app_timer_appsh.c \ + libraries/util/app_error.c \ libraries/util/nrf_assert.c \ - drivers_nrf/hal/nrf_delay.c \ - drivers_nrf/pstorage/pstorage_raw.c \ - ble/common/ble_advdata.c \ - ble/common/ble_conn_params.c \ - ble/ble_services/ble_dfu/ble_dfu.c \ - ble/common/ble_srv_common.c \ - toolchain/system_nrf51.c \ softdevice/common/softdevice_handler/softdevice_handler.c \ softdevice/common/softdevice_handler/softdevice_handler_appsh.c \ + toolchain/system_nrf51.c SDKSSRCS = toolchain/gcc/gcc_startup_nrf51.s @@ -50,10 +51,6 @@ SDKSSRCS = toolchain/gcc/gcc_startup_nrf51.s CSRCS = \ dfu_ble_svc.c \ main.c \ - sdk-config/sdk/libraries/bootloader_dfu/dfu_transport_ble.c \ - -# sdk-config/sdk/libraries/bootloader_dfu/dfu_single_bank.c \ -# sdk-config/sdk/libraries/bootloader_dfu/dfu_transport_ble.c \ SOFTDEVICE=${SDK}/sdk/softdevice/s130/hex/s130_softdevice.hex -- cgit v1.2.3