From ca400565b3ba7183a08de79df257f7a32a6c3754 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 24 Apr 2019 12:08:58 +0700 Subject: [PATCH] clean up --- Makefile | 3 ++- src/boards.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4d3b2e9..8c74c35 100644 --- a/Makefile +++ b/Makefile @@ -194,6 +194,8 @@ endif # src IPATH += $(SRC_PATH) +IPATH += $(SRC_PATH)/boards/$(BOARD) + IPATH += $(SRC_PATH)/cmsis/include IPATH += $(SRC_PATH)/usb IPATH += $(SRC_PATH)/boards @@ -260,7 +262,6 @@ CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"' CFLAGS += -DBOARD_$(shell echo $(BOARD) | tr '[:lower:]' '[:upper:]') -CFLAGS += -DBOARD_HEADER_FILE='"$(BOARD)/board.h"' ifneq ($(IS_52832),) CFLAGS += -DNRF52 diff --git a/src/boards.h b/src/boards.h index 1358df0..cd1760b 100644 --- a/src/boards.h +++ b/src/boards.h @@ -30,8 +30,7 @@ #include #include "nrf_gpio.h" - -#include BOARD_HEADER_FILE +#include "board.h" #ifndef BUTTON_DFU #define BUTTON_DFU BUTTON_1