Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: e499502)
kinetis_ke: Switch to standard build variables 05/3505/2
authorAndreas Färber <afaerber@suse.de>
Sun, 22 May 2016 17:12:20 +0000 (19:12 +0200)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sat, 13 Aug 2016 08:19:43 +0000 (09:19 +0100)
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 <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3505
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
contrib/loaders/Makefile patch | blob | history
contrib/loaders/flash/kinetis_ke/Makefile patch | blob | history

diff --git a/contrib/loaders/Makefile b/contrib/loaders/Makefile
index cd37dde1ba288844e48d73aa523fcb8edaf551a7..2e5eba8c25e827903af6b4f7b3df4eeb37f1b982 100644 (file)
--- 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 50779123fac8a0f76ecbc55b20977740d8b3f95d..a0331a2ed66d6c1f13a49600e6386bce89d7ef0f 100644 (file)
--- 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:
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)