From 2ec09ebd745fbf41ba871dc9e4935f5beee5a293 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sun, 8 Mar 2020 15:03:49 +0100 Subject: [PATCH] boards/nrf52: remove useless export of FLASH_TARGET_TYPE --- boards/calliope-mini/Makefile.include | 2 +- boards/common/particle-mesh/Makefile.include | 2 +- boards/nrf52832-mdk/Makefile.include | 2 +- boards/nrf52840-mdk/Makefile.include | 2 +- boards/pinetime/Makefile.include | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index 871d8adbf2..0b93039025 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -10,7 +10,7 @@ ifeq (openocd,$(PROGRAMMER)) else ifeq (pyocd,$(PROGRAMMER)) # PyOCD doesn't recognize automatically the board ID, so target type has to # be passed explicitly - export FLASH_TARGET_TYPE ?= -t nrf51 + FLASH_TARGET_TYPE ?= -t nrf51 include $(RIOTMAKE)/tools/pyocd.inc.mk endif diff --git a/boards/common/particle-mesh/Makefile.include b/boards/common/particle-mesh/Makefile.include index 8711710452..5988b063ea 100644 --- a/boards/common/particle-mesh/Makefile.include +++ b/boards/common/particle-mesh/Makefile.include @@ -17,7 +17,7 @@ PROGRAMMER ?= pyocd ifeq (pyocd,$(PROGRAMMER)) # The board is not recognized automatically by pyocd, so the CPU target # option is passed explicitly - export FLASH_TARGET_TYPE ?= -t nrf52840 + FLASH_TARGET_TYPE ?= -t nrf52840 include $(RIOTMAKE)/tools/pyocd.inc.mk else ifeq (openocd,$(PROGRAMMER)) DEBUG_ADAPTER ?= dap diff --git a/boards/nrf52832-mdk/Makefile.include b/boards/nrf52832-mdk/Makefile.include index e13aa13ed3..c66a1e7563 100644 --- a/boards/nrf52832-mdk/Makefile.include +++ b/boards/nrf52832-mdk/Makefile.include @@ -6,7 +6,7 @@ PROGRAMMER ?= pyocd ifeq (pyocd,$(PROGRAMMER)) # The board is not recognized automatically by pyocd, so the CPU target # option is passed explicitly - export FLASH_TARGET_TYPE ?= -t $(CPU) + FLASH_TARGET_TYPE ?= -t $(CPU) include $(RIOTMAKE)/tools/pyocd.inc.mk else ifeq (openocd,$(PROGRAMMER)) DEBUG_ADAPTER = dap diff --git a/boards/nrf52840-mdk/Makefile.include b/boards/nrf52840-mdk/Makefile.include index 507de6fbff..b234201526 100644 --- a/boards/nrf52840-mdk/Makefile.include +++ b/boards/nrf52840-mdk/Makefile.include @@ -6,7 +6,7 @@ PROGRAMMER ?= pyocd ifeq (pyocd,$(PROGRAMMER)) # The board is not recognized automatically by pyocd, so the CPU target # option is passed explicitly - export FLASH_TARGET_TYPE ?= -t nrf52840 + FLASH_TARGET_TYPE ?= -t nrf52840 include $(RIOTMAKE)/tools/pyocd.inc.mk else ifeq (openocd,$(PROGRAMMER)) DEBUG_ADAPTER = dap diff --git a/boards/pinetime/Makefile.include b/boards/pinetime/Makefile.include index 71cccc1723..34a9c03843 100644 --- a/boards/pinetime/Makefile.include +++ b/boards/pinetime/Makefile.include @@ -4,7 +4,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk # define pyocd as programmer to program with stlink ifeq (pyocd,$(PROGRAMMER)) - export FLASH_TARGET_TYPE ?= -t $(CPU) + FLASH_TARGET_TYPE ?= -t $(CPU) include $(RIOTMAKE)/tools/pyocd.inc.mk endif