ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Exporter outputs hex

pull/337/head
Juan Carlos Ferrer 2014-06-02 18:50:02 -05:00
parent 64cebfa232
commit 7716e927b9
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
workspace_tools/export/gcc_arm_nrf51822.tmpl
View File

@ -30,10 +30,10 @@ else
CC_FLAGS += -DNDEBUG -Os
endif
all: $(PROJECT).bin
all: $(PROJECT).hex
clean:
rm -f $(PROJECT).bin $(PROJECT).elf $(OBJECTS)
rm -f $(PROJECT).hex $(PROJECT).elf $(OBJECTS)
.s.o:
$(AS) $(CPU) -o $@ $<
@ -48,5 +48,5 @@ clean:
$(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS)
$(LD) $(LD_FLAGS) -T$(LINKER_SCRIPT) $(LIBRARY_PATHS) -o $@ $^ $(LIBRARIES) $(LD_SYS_LIBS) $(LIBRARIES) $(LD_SYS_LIBS)
$(PROJECT).bin: $(PROJECT).elf
$(OBJCOPY) -O binary $< $@
$(PROJECT).hex: $(PROJECT).elf
$(OBJCOPY) -O ihex $< $@

2
workspace_tools/targets.py
View File

@ -525,7 +525,7 @@ class NRF51822(Target):
return 6 if self.is_disk_virtual else 1.5
def init_hooks(self, hook, toolchain_name):
if toolchain_name in ['ARM_STD', 'ARM_MICRO', 'GCC_ARM']:
if toolchain_name in ['ARM_STD', 'ARM_MICRO']:
hook.hook_add_binary("post", self.binary_hook)
@staticmethod

2
workspace_tools/toolchains/gcc.py
View File

@ -20,7 +20,6 @@ from os.path import join, basename, splitext
from workspace_tools.toolchains import mbedToolchain
from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH, GCC_CS_PATH, CW_EWL_PATH, CW_GCC_PATH
from workspace_tools.settings import GOANNA_PATH
from workspace_tools.hooks import hook_tool
class GCC(mbedToolchain):
LINKER_EXT = '.ld'
@ -162,7 +161,6 @@ class GCC(mbedToolchain):
self.default_cmd(self.hook.get_cmdline_linker(self.ld + ["-T%s" % mem_map, "-o", output] +
objects + ["-L%s" % L for L in lib_dirs] + libs))
@hook_tool
def binary(self, resources, elf, bin):
self.default_cmd(self.hook.get_cmdline_binary([self.elf2bin, "-O", "binary", elf, bin]))