From c1331060835746c135e87550a5fdde6f4d822e47 Mon Sep 17 00:00:00 2001 From: jaseg Date: Sat, 11 May 2013 17:03:29 +0200 Subject: [PATCH] Fixed normal avr builds --- avr/Makefile | 2 +- build.py | 2 +- generator.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/avr/Makefile b/avr/Makefile index 84feb19..5231a43 100644 --- a/avr/Makefile +++ b/avr/Makefile @@ -12,4 +12,4 @@ program: avrdude -V -c ${PROGRAMMER} -P ${PORT} -b ${PROGRAMMER_BAUDRATE} -U flash:w:main.hex -p ${MCU} clean: - rm *.elf main.eep main.lss main.map main.sym main.hex autocode.c config.c *.lst *.o + rm *.elf main.eep main.lss main.map main.sym main.hex autocode.c config.c *.lst *.o || true diff --git a/build.py b/build.py index c5f63fa..c79ac41 100755 --- a/build.py +++ b/build.py @@ -34,7 +34,7 @@ st = datetime.datetime.utcnow().timetuple() builddate = str(datetime.datetime(st[0], st[1], st[2], st[3], st[4], st[5])) buildsource = 'stdin' if args.template.name is '-' else args.template.name print(builddate) -print('Generating firmware from ', buildsource) +print('Generating firmware from ', buildsource, "for", desc['type']) # Generate code and write generated build config # FIXME there are two different but similar things called "build config" here. diff --git a/generator.py b/generator.py index c29b876..c50040d 100644 --- a/generator.py +++ b/generator.py @@ -291,7 +291,7 @@ def generate(desc, device, build_path, builddate, target = 'all', node_id=None): make_env['CLOCK'] = str(device.get('clock')) make_env['CEREBRUM_BAUDRATE'] = str(device.get('cerebrum_baudrate')) make_env['CONFIG_MAC'] = str(node_id) #0xFFFF,FFFF,FFFF,FFFF is reserved as discovery address - subprocess.check_call(['/usr/bin/env', 'make', '--no-print-directory', '-C', build_path, 'clean', target], env=make_env) + subprocess.check_call(['/usr/bin/env', 'make', '--no-print-directory', '-C', build_path, target], env=make_env) desc['node_id'] = node_id print('\x1b[92;1mNode ID:\x1b[0m {:#016x}'.format(node_id)) -- 2.11.4.GIT