From 02f17f0ba37fb64de688344b5d39272ed7c39844 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Sun, 22 May 2016 19:12:20 +0200 Subject: [PATCH 1/1] kinetis_ke: Switch to standard build variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Instead of using ARM_ prefixed variables and an "arm" target, use CROSS_COMPILE, AS, OBJCOPY. This requires to switch from ?= to = to avoid the host assembler getting invoked. This allows to handle kinetis_ke subdirectory like fm4 and xmc1xxx. Change-Id: I7ea0bf119f6c4716f4d6002794004730af49eef4 Signed-off-by: Andreas Färber Reviewed-on: http://openocd.zylin.com/3505 Tested-by: jenkins Reviewed-by: Tomas Vanek --- contrib/loaders/Makefile | 2 +- contrib/loaders/flash/kinetis_ke/Makefile | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/loaders/Makefile b/contrib/loaders/Makefile index cd37dde1ba..2e5eba8c25 100644 --- a/contrib/loaders/Makefile +++ b/contrib/loaders/Makefile @@ -5,13 +5,13 @@ all: arm common_dirs = \ checksum \ erase_check \ - flash/kinetis_ke \ watchdog ARM_CROSS_COMPILE ?= arm-none-eabi- arm_dirs = \ flash/fm4 \ + flash/kinetis_ke \ flash/xmc1xxx arm: diff --git a/contrib/loaders/flash/kinetis_ke/Makefile b/contrib/loaders/flash/kinetis_ke/Makefile index 50779123fa..a0331a2ed6 100644 --- a/contrib/loaders/flash/kinetis_ke/Makefile +++ b/contrib/loaders/flash/kinetis_ke/Makefile @@ -1,18 +1,18 @@ BIN2C = ../../../../src/helper/bin2char.sh -ARM_CROSS_COMPILE ?= arm-none-eabi- -ARM_AS ?= $(ARM_CROSS_COMPILE)as -ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy +CROSS_COMPILE ?= arm-none-eabi- +AS = $(CROSS_COMPILE)as +OBJCOPY = $(CROSS_COMPILE)objcopy -arm: kinetis_ke_flash.inc kinetis_ke_watchdog.inc +all: kinetis_ke_flash.inc kinetis_ke_watchdog.inc -kinetis_ke_%.elf: kinetis_ke_%.s - $(ARM_AS) $< -o $@ +%.elf: %.s + $(AS) $< -o $@ -kinetis_ke_%.bin: kinetis_ke_%.elf - $(ARM_OBJCOPY) -Obinary $< $@ +%.bin: %.elf + $(OBJCOPY) -Obinary $< $@ -kinetis_ke_%.inc: kinetis_ke_%.bin +%.inc: %.bin $(BIN2C) < $< > $@ clean: -- 2.30.2