From 8cebed679211e374fdffdd30b059976ecbffb4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 2 May 2019 12:17:56 +0200 Subject: [PATCH 1/9] boards/common/esp: harmonize CPU/CPU_MODEL to other boards * CPU files should already have 'CPU' defined by the board. * Do not conditionally define CPU as it is not needed. This is part of cleanup prior to moving the CPU/CPU_MODEL to Makefile.features. --- boards/common/esp32/Makefile.include | 4 ++-- boards/common/esp8266/Makefile.include | 4 ++-- cpu/esp32/Makefile.include | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include index 5087328682..9a4f711f06 100644 --- a/boards/common/esp32/Makefile.include +++ b/boards/common/esp32/Makefile.include @@ -1,6 +1,6 @@ # the cpu to build for -export CPU ?= esp32 -export CPU_MODEL ?= esp32 +export CPU = esp32 +export CPU_MODEL = esp32 # configure the serial interface PORT_LINUX ?= /dev/ttyUSB0 diff --git a/boards/common/esp8266/Makefile.include b/boards/common/esp8266/Makefile.include index 44a141a366..63a50b28e8 100644 --- a/boards/common/esp8266/Makefile.include +++ b/boards/common/esp8266/Makefile.include @@ -1,6 +1,6 @@ # the cpu to build for -export CPU ?= esp8266 -export CPU_MODEL ?= esp8266 +export CPU = esp8266 +export CPU_MODEL = esp8266 # configure the serial interface PORT_LINUX ?= /dev/ttyUSB0 diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index fdf445a7c0..983676e55d 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -59,7 +59,6 @@ PSEUDOMODULES += esp_spi_ram PSEUDOMODULES += esp_spiffs PSEUDOMODULES += esp_wifi_any -export CPU ?= esp32 export TARGET_ARCH ?= xtensa-esp32-elf export ESPTOOL ?= $(ESP32_SDK_DIR)/components/esptool_py/esptool/esptool.py From 49d61bbe6e93116e1c9cd4c3d502d9221e324d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 2 May 2019 15:49:35 +0200 Subject: [PATCH 2/9] boards/common/esp: move CPU/CPU_MODEL definiton to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/common/esp32/Makefile.dep | 2 -- boards/common/esp32/Makefile.features | 4 ++-- boards/common/esp32/Makefile.include | 4 ---- boards/common/esp8266/Makefile.dep | 2 -- boards/common/esp8266/Makefile.features | 5 ++--- boards/common/esp8266/Makefile.include | 4 ---- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/boards/common/esp32/Makefile.dep b/boards/common/esp32/Makefile.dep index 2f0586ac52..5472bf8b8d 100644 --- a/boards/common/esp32/Makefile.dep +++ b/boards/common/esp32/Makefile.dep @@ -1,5 +1,3 @@ -include $(RIOTCPU)/esp32/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif diff --git a/boards/common/esp32/Makefile.features b/boards/common/esp32/Makefile.features index 963790ff90..4766f0b22f 100644 --- a/boards/common/esp32/Makefile.features +++ b/boards/common/esp32/Makefile.features @@ -1,5 +1,5 @@ -# most board features results directly from ESP32 CPU features -include $(RIOTCPU)/esp32/Makefile.features +CPU = esp32 +CPU_MODEL = esp32 # additional features provided by all boards are GPIOs and at least one UART FEATURES_PROVIDED += periph_gpio diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include index 9a4f711f06..232091175e 100644 --- a/boards/common/esp32/Makefile.include +++ b/boards/common/esp32/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = esp32 -export CPU_MODEL = esp32 - # configure the serial interface PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/common/esp8266/Makefile.dep b/boards/common/esp8266/Makefile.dep index 63fcc8a2a6..5472bf8b8d 100644 --- a/boards/common/esp8266/Makefile.dep +++ b/boards/common/esp8266/Makefile.dep @@ -1,5 +1,3 @@ -include $(RIOTCPU)/esp8266/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif diff --git a/boards/common/esp8266/Makefile.features b/boards/common/esp8266/Makefile.features index 3bad7fb344..127c7b88b8 100644 --- a/boards/common/esp8266/Makefile.features +++ b/boards/common/esp8266/Makefile.features @@ -1,6 +1,5 @@ -# MCU defined features that are provided independent on board definitions - -include $(RIOTCPU)/esp8266/Makefile.features +CPU = esp8266 +CPU_MODEL = esp8266 # MCU defined peripheral features provided by all boards in alphabetical order diff --git a/boards/common/esp8266/Makefile.include b/boards/common/esp8266/Makefile.include index 63a50b28e8..232091175e 100644 --- a/boards/common/esp8266/Makefile.include +++ b/boards/common/esp8266/Makefile.include @@ -1,7 +1,3 @@ -# the cpu to build for -export CPU = esp8266 -export CPU_MODEL = esp8266 - # configure the serial interface PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) From 5f1a61ed7244d52a15fcb23d23f2e0c54ed3400d Mon Sep 17 00:00:00 2001 From: cladmi Date: Sat, 22 Sep 2018 07:12:36 +0200 Subject: [PATCH 3/9] boards/common/nrf52: move CPU/CPU_MODEL definiton to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/common/nrf52/Makefile.dep | 2 -- boards/common/nrf52/Makefile.features | 4 ++-- boards/common/nrf52/Makefile.include | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/boards/common/nrf52/Makefile.dep b/boards/common/nrf52/Makefile.dep index c1c5d218e3..404ea2f44a 100644 --- a/boards/common/nrf52/Makefile.dep +++ b/boards/common/nrf52/Makefile.dep @@ -1,5 +1,3 @@ -include $(RIOTCPU)/nrf52/Makefile.dep - ifneq (,$(filter skald,$(USEMODULE))) USEMODULE += nrfble endif diff --git a/boards/common/nrf52/Makefile.features b/boards/common/nrf52/Makefile.features index 0841e5c639..a3e117668b 100644 --- a/boards/common/nrf52/Makefile.features +++ b/boards/common/nrf52/Makefile.features @@ -1,3 +1,5 @@ +CPU = nrf52 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_timer @@ -8,5 +10,3 @@ endif # Various other features (if any) FEATURES_PROVIDED += ble_nimble FEATURES_PROVIDED += radio_nrfble - -include $(RIOTCPU)/nrf52/Makefile.features diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include index 46dd5fffbd..d120565077 100644 --- a/boards/common/nrf52/Makefile.include +++ b/boards/common/nrf52/Makefile.include @@ -1,6 +1,3 @@ -# this module contains shared code for all boards using the nrf52 CPU -export CPU = nrf52 - # include this module into the build INCLUDES += -I$(RIOTBOARD)/common/nrf52/include From 0029bb33ef1e3e0b56666d98c192e1661bb4d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 15 Aug 2019 11:47:07 +0200 Subject: [PATCH 4/9] boards/nrf6310: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/nrf6310/Makefile.features | 4 ++-- boards/nrf6310/Makefile.include | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features index d2712cafab..46b201fafb 100644 --- a/boards/nrf6310/Makefile.features +++ b/boards/nrf6310/Makefile.features @@ -1,8 +1,8 @@ +CPU_MODEL = nrf51x22xxaa + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart # include common nrf51 based boards features include $(RIOTBOARD)/common/nrf51/Makefile.features - -include $(RIOTCPU)/nrf51/Makefile.features diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include index a70b6acf73..26fa8f3365 100644 --- a/boards/nrf6310/Makefile.include +++ b/boards/nrf6310/Makefile.include @@ -1,6 +1,3 @@ -# define the used CPU -export CPU_MODEL = nrf51x22xxaa - # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) From 29459beaf27a2ea2b7b08b1bec72208f6a795b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH 5/9] boards/hifive1*: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/hifive1/Makefile.dep | 1 - boards/hifive1/Makefile.features | 5 +++-- boards/hifive1/Makefile.include | 4 ---- boards/hifive1b/Makefile.dep | 1 - boards/hifive1b/Makefile.features | 5 +++-- boards/hifive1b/Makefile.include | 4 ---- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/boards/hifive1/Makefile.dep b/boards/hifive1/Makefile.dep index 2b839df74c..e69de29bb2 100644 --- a/boards/hifive1/Makefile.dep +++ b/boards/hifive1/Makefile.dep @@ -1 +0,0 @@ -include $(RIOTCPU)/fe310/Makefile.dep diff --git a/boards/hifive1/Makefile.features b/boards/hifive1/Makefile.features index 5c5f80f8c8..78ce180352 100644 --- a/boards/hifive1/Makefile.features +++ b/boards/hifive1/Makefile.features @@ -1,3 +1,6 @@ +CPU = fe310 +CPU_MODEL = fe310_g000 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq #FEATURES_PROVIDED += periph_pwm @@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_rtt #FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/fe310/Makefile.features diff --git a/boards/hifive1/Makefile.include b/boards/hifive1/Makefile.include index 14a5395762..c6856fcdd6 100644 --- a/boards/hifive1/Makefile.include +++ b/boards/hifive1/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the HiFive1 board -export CPU = fe310 -export CPU_MODEL = fe310_g000 - # Uses UART0 for stdio input/output (comment out to disable) USEMODULE += stdio_uart diff --git a/boards/hifive1b/Makefile.dep b/boards/hifive1b/Makefile.dep index 2b839df74c..e69de29bb2 100644 --- a/boards/hifive1b/Makefile.dep +++ b/boards/hifive1b/Makefile.dep @@ -1 +0,0 @@ -include $(RIOTCPU)/fe310/Makefile.dep diff --git a/boards/hifive1b/Makefile.features b/boards/hifive1b/Makefile.features index e2d05e1f19..f473dcc2c0 100644 --- a/boards/hifive1b/Makefile.features +++ b/boards/hifive1b/Makefile.features @@ -1,3 +1,6 @@ +CPU = fe310 +CPU_MODEL = fe310_g002 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq #FEATURES_PROVIDED += periph_i2c @@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtt #FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/fe310/Makefile.features diff --git a/boards/hifive1b/Makefile.include b/boards/hifive1b/Makefile.include index 6f4bdf248b..4dc8c6fd44 100644 --- a/boards/hifive1b/Makefile.include +++ b/boards/hifive1b/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the HiFive1 board -export CPU = fe310 -export CPU_MODEL = fe310_g002 - # Uses UART0 for stdio input/output (comment out to disable) USEMODULE += stdio_uart From 33816cbbb340dbec79aaecf04ff6169eaeb22966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH 6/9] boards/pic32*: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Add the missing space when defining 'CPU_MODEL'. Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/pic32-clicker/Makefile.features | 5 +++-- boards/pic32-clicker/Makefile.include | 2 -- boards/pic32-wifire/Makefile.features | 5 +++-- boards/pic32-wifire/Makefile.include | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/boards/pic32-clicker/Makefile.features b/boards/pic32-clicker/Makefile.features index 328dd02c76..c10c2eb5ba 100644 --- a/boards/pic32-clicker/Makefile.features +++ b/boards/pic32-clicker/Makefile.features @@ -1,6 +1,7 @@ +CPU = mips_pic32mx +CPU_MODEL = p32mx470f512h + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/mips_pic32mx/Makefile.features diff --git a/boards/pic32-clicker/Makefile.include b/boards/pic32-clicker/Makefile.include index 6e3898c579..823d462545 100644 --- a/boards/pic32-clicker/Makefile.include +++ b/boards/pic32-clicker/Makefile.include @@ -1,5 +1,3 @@ -export CPU = mips_pic32mx -export CPU_MODEL=p32mx470f512h export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1 diff --git a/boards/pic32-wifire/Makefile.features b/boards/pic32-wifire/Makefile.features index 9e83dbd44d..051b80b1dc 100644 --- a/boards/pic32-wifire/Makefile.features +++ b/boards/pic32-wifire/Makefile.features @@ -1,6 +1,7 @@ +CPU = mips_pic32mz +CPU_MODEL = p32mz2048efg100 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/mips_pic32mz/Makefile.features diff --git a/boards/pic32-wifire/Makefile.include b/boards/pic32-wifire/Makefile.include index c07595ef98..823d462545 100644 --- a/boards/pic32-wifire/Makefile.include +++ b/boards/pic32-wifire/Makefile.include @@ -1,5 +1,3 @@ -export CPU = mips_pic32mz -export CPU_MODEL=p32mz2048efg100 export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1 From 17877ca993fc887da521fab77318c12e68ad6a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH 7/9] boards/ek-lm4f120xl: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included CPU_MODEL is currently kept uppercase. Making it lowercase is a future task. Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/ek-lm4f120xl/Makefile.features | 5 +++-- boards/ek-lm4f120xl/Makefile.include | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boards/ek-lm4f120xl/Makefile.features b/boards/ek-lm4f120xl/Makefile.features index 7b3050728c..46e86ac374 100644 --- a/boards/ek-lm4f120xl/Makefile.features +++ b/boards/ek-lm4f120xl/Makefile.features @@ -1,8 +1,9 @@ +CPU = lm4f120 +CPU_MODEL = LM4F120H5QR + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/lm4f120/Makefile.features diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index d29ea94951..f2ca52974b 100644 --- a/boards/ek-lm4f120xl/Makefile.include +++ b/boards/ek-lm4f120xl/Makefile.include @@ -1,7 +1,3 @@ -# define the cpu used by the ek-lm4f120xl board -export CPU = lm4f120 -export CPU_MODEL = LM4F120H5QR - #define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) From 8a2d9998480b546d304584eda5331e0e55d44450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH 8/9] boards/cc2538dk: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/cc2538dk/Makefile.features | 5 +++-- boards/cc2538dk/Makefile.include | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boards/cc2538dk/Makefile.features b/boards/cc2538dk/Makefile.features index 2d293db776..d0a0fd0e5d 100644 --- a/boards/cc2538dk/Makefile.features +++ b/boards/cc2538dk/Makefile.features @@ -1,3 +1,6 @@ +CPU = cc2538 +CPU_MODEL ?= cc2538nf53 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_i2c @@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_adc # Various other features (if any) FEATURES_PROVIDED += emulator_renode - -include $(RIOTCPU)/cc2538/Makefile.features diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index cca186c348..c4857afc7f 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -1,7 +1,3 @@ -# Define the cpu used by the CC2538DK board: -export CPU = cc2538 -export CPU_MODEL ?= cc2538nf53 - # the SmartRF06 Evaluation Board serial numbers all begin with "06EB": PROGRAMMER_SERIAL ?= 06EB From cdca4d89a9bf854cdb6af00f933f7166a0711d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 2 May 2019 15:49:35 +0200 Subject: [PATCH 9/9] boards/mulle: move CPU/CPU_MODEL definiton to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included The multiple boards handling has been changed to use 'CPU_MODEL ?='. Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/mulle/Makefile.dep | 2 -- boards/mulle/Makefile.features | 12 ++++++++++-- boards/mulle/Makefile.include | 16 ---------------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/boards/mulle/Makefile.dep b/boards/mulle/Makefile.dep index f6ca7bf86e..da2b0fe785 100644 --- a/boards/mulle/Makefile.dep +++ b/boards/mulle/Makefile.dep @@ -19,5 +19,3 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio USEMODULE += saul_adc endif - -include $(RIOTCPU)/kinetis/Makefile.dep diff --git a/boards/mulle/Makefile.features b/boards/mulle/Makefile.features index 7f72c799ee..2898318971 100644 --- a/boards/mulle/Makefile.features +++ b/boards/mulle/Makefile.features @@ -1,3 +1,13 @@ +CPU = kinetis + +### CPU part number (must have a specific linker script for each part) +# Note that MK60DN256ZVLL10 (version 1.x) and MK60DN256VLL10 (version 2.x, no Z) +# only differ in some register locations etc, not in the actual memory layout, +# so it is safe to use the same linker script for both version 1.x and version +# 2.x silicon. +# The linker script needs to know the flash and RAM sizes of the device. +CPU_MODEL ?= mk60dn512vll10 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_dac @@ -8,5 +18,3 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/kinetis/Makefile.features diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index 6f0a3c2ee9..1fc475f3df 100644 --- a/boards/mulle/Makefile.include +++ b/boards/mulle/Makefile.include @@ -1,24 +1,8 @@ -# define the cpu used by the Mulle board -export CPU = kinetis - # MULLE_SERIAL is used to select which specific Mulle board we are compiling for. ifdef MULLE_SERIAL CFLAGS += -DMULLE_SERIAL=$(MULLE_SERIAL) endif -### CPU part number (must have a specific linker script for each part) -# Note that MK60DN256ZVLL10 (version 1.x) and MK60DN256VLL10 (version 2.x, no Z) -# only differ in some register locations etc, not in the actual memory layout, -# so it is safe to use the same linker script for both version 1.x and version -# 2.x silicon. -# The linker script needs to know the flash and RAM sizes of the device. - -ifeq ($(CPU_MODEL),) - CPU_MODEL = mk60dn512vll10 -endif - -export CPU_MODEL - # Default debug adapter choice is to use the Mulle programmer board DEBUG_ADAPTER ?= mulle # Host OS name