From 708f68a3d28c3a56a7aad950ae1cbe4db535953a Mon Sep 17 00:00:00 2001 From: liuhaitao Date: Tue, 30 Jun 2020 11:24:24 +0800 Subject: [PATCH] stm32/nucleo-f412zg: update nucleo-f412zg files to fix nightly build break Signed-off-by: liuhaitao --- boards/arm/stm32/nucleo-f412zg/src/{Makefile => Make.defs} | 4 +++- boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c | 4 ++-- boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename boards/arm/stm32/nucleo-f412zg/src/{Makefile => Make.defs} (92%) diff --git a/boards/arm/stm32/nucleo-f412zg/src/Makefile b/boards/arm/stm32/nucleo-f412zg/src/Make.defs similarity index 92% rename from boards/arm/stm32/nucleo-f412zg/src/Makefile rename to boards/arm/stm32/nucleo-f412zg/src/Make.defs index 10c0e70d9d7..3b47309322a 100644 --- a/boards/arm/stm32/nucleo-f412zg/src/Makefile +++ b/boards/arm/stm32/nucleo-f412zg/src/Make.defs @@ -50,4 +50,6 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -include $(TOPDIR)/boards/Board.mk +DEPPATH += --dep-path board +VPATH += :board +CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board) diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c index 4ee685fa9e5..70892d39db9 100644 --- a/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c +++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f412zg.h" diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c index 29dc7815f69..0bc4afda024 100644 --- a/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f412zg.h" /**************************************************************************** * Public Functions