From 54cf33ff7014f2cd4facb1e0b06e517026e4f0f0 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 30 Jan 2014 12:10:18 +0100 Subject: [PATCH 1/3] set lpc2k_pgm return value fixes the build not failing when flashing fails --- boards/msba2-common/tools/src/lpc2k_pgm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.c b/boards/msba2-common/tools/src/lpc2k_pgm.c index 8c74429887..756aa5b967 100644 --- a/boards/msba2-common/tools/src/lpc2k_pgm.c +++ b/boards/msba2-common/tools/src/lpc2k_pgm.c @@ -47,11 +47,13 @@ #include "download.h" int programming_done = 0; +int programming_status = 0; int done_program(int i) { printf("Programming done.\n"); programming_done = 1; + programming_status = i; return 0; } @@ -96,6 +98,6 @@ int main(int argc, char **argv) close_serial_port(); - return 0; + return programming_status; } From 6fda735302123657387c7d5a287cb4bca15b1c90 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Fri, 31 Jan 2014 16:47:31 +0100 Subject: [PATCH 2/3] remove cruft from obj dir, add gitignore --- boards/msba2-common/tools/obj/.gitignore | 2 ++ boards/msba2-common/tools/obj/boot_23xx.d | 3 --- boards/msba2-common/tools/obj/boot_2xxx.d | 3 --- boards/msba2-common/tools/obj/chipinfo.d | 8 -------- boards/msba2-common/tools/obj/control_2xxx.d | 5 ----- boards/msba2-common/tools/obj/download.d | 19 ------------------- boards/msba2-common/tools/obj/ihex.d | 3 --- boards/msba2-common/tools/obj/lpc2k_pgm.d | 8 -------- boards/msba2-common/tools/obj/pseudoterm.d | 5 ----- boards/msba2-common/tools/obj/serial.d | 3 --- boards/msba2-common/tools/obj/uuencode.d | 3 --- 11 files changed, 2 insertions(+), 60 deletions(-) create mode 100644 boards/msba2-common/tools/obj/.gitignore delete mode 100644 boards/msba2-common/tools/obj/boot_23xx.d delete mode 100644 boards/msba2-common/tools/obj/boot_2xxx.d delete mode 100644 boards/msba2-common/tools/obj/chipinfo.d delete mode 100644 boards/msba2-common/tools/obj/control_2xxx.d delete mode 100644 boards/msba2-common/tools/obj/download.d delete mode 100644 boards/msba2-common/tools/obj/ihex.d delete mode 100644 boards/msba2-common/tools/obj/lpc2k_pgm.d delete mode 100644 boards/msba2-common/tools/obj/pseudoterm.d delete mode 100644 boards/msba2-common/tools/obj/serial.d delete mode 100644 boards/msba2-common/tools/obj/uuencode.d diff --git a/boards/msba2-common/tools/obj/.gitignore b/boards/msba2-common/tools/obj/.gitignore new file mode 100644 index 0000000000..6142305dc1 --- /dev/null +++ b/boards/msba2-common/tools/obj/.gitignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/boards/msba2-common/tools/obj/boot_23xx.d b/boards/msba2-common/tools/obj/boot_23xx.d deleted file mode 100644 index e45338d651..0000000000 --- a/boards/msba2-common/tools/obj/boot_23xx.d +++ /dev/null @@ -1,3 +0,0 @@ -obj/boot_23xx.d: src/boot_23xx.c src/boot_23xx.h - -src/boot_23xx.h: diff --git a/boards/msba2-common/tools/obj/boot_2xxx.d b/boards/msba2-common/tools/obj/boot_2xxx.d deleted file mode 100644 index e0e9fb40da..0000000000 --- a/boards/msba2-common/tools/obj/boot_2xxx.d +++ /dev/null @@ -1,3 +0,0 @@ -obj/boot_2xxx.d: src/boot_2xxx.c src/boot_2xxx.h - -src/boot_2xxx.h: diff --git a/boards/msba2-common/tools/obj/chipinfo.d b/boards/msba2-common/tools/obj/chipinfo.d deleted file mode 100644 index b695e68c42..0000000000 --- a/boards/msba2-common/tools/obj/chipinfo.d +++ /dev/null @@ -1,8 +0,0 @@ -obj/chipinfo.d: src/chipinfo.c src/chipinfo.h src/boot_2xxx.h \ - src/boot_23xx.h - -src/chipinfo.h: - -src/boot_2xxx.h: - -src/boot_23xx.h: diff --git a/boards/msba2-common/tools/obj/control_2xxx.d b/boards/msba2-common/tools/obj/control_2xxx.d deleted file mode 100644 index e9ed3f7b1b..0000000000 --- a/boards/msba2-common/tools/obj/control_2xxx.d +++ /dev/null @@ -1,5 +0,0 @@ -obj/control_2xxx.d: src/control_2xxx.c src/control_2xxx.h src/serial.h - -src/control_2xxx.h: - -src/serial.h: diff --git a/boards/msba2-common/tools/obj/download.d b/boards/msba2-common/tools/obj/download.d deleted file mode 100644 index 94c10a80c5..0000000000 --- a/boards/msba2-common/tools/obj/download.d +++ /dev/null @@ -1,19 +0,0 @@ -obj/download.d: src/download.c src/lpc2k_pgm.h src/download.h \ - src/serial.h src/ihex.h src/uuencode.h src/chipinfo.h src/boot.h \ - src/control_2xxx.h - -src/lpc2k_pgm.h: - -src/download.h: - -src/serial.h: - -src/ihex.h: - -src/uuencode.h: - -src/chipinfo.h: - -src/boot.h: - -src/control_2xxx.h: diff --git a/boards/msba2-common/tools/obj/ihex.d b/boards/msba2-common/tools/obj/ihex.d deleted file mode 100644 index 89b506056a..0000000000 --- a/boards/msba2-common/tools/obj/ihex.d +++ /dev/null @@ -1,3 +0,0 @@ -obj/ihex.d: src/ihex.c src/ihex.h - -src/ihex.h: diff --git a/boards/msba2-common/tools/obj/lpc2k_pgm.d b/boards/msba2-common/tools/obj/lpc2k_pgm.d deleted file mode 100644 index 98c82eb328..0000000000 --- a/boards/msba2-common/tools/obj/lpc2k_pgm.d +++ /dev/null @@ -1,8 +0,0 @@ -obj/lpc2k_pgm.d: src/lpc2k_pgm.c src/lpc2k_pgm.h src/serial.h \ - src/download.h - -src/lpc2k_pgm.h: - -src/serial.h: - -src/download.h: diff --git a/boards/msba2-common/tools/obj/pseudoterm.d b/boards/msba2-common/tools/obj/pseudoterm.d deleted file mode 100644 index 858fa2cba7..0000000000 --- a/boards/msba2-common/tools/obj/pseudoterm.d +++ /dev/null @@ -1,5 +0,0 @@ -obj/pseudoterm.d: src/pseudoterm.c src/serial.h src/download.h - -src/serial.h: - -src/download.h: diff --git a/boards/msba2-common/tools/obj/serial.d b/boards/msba2-common/tools/obj/serial.d deleted file mode 100644 index ebabf01ecf..0000000000 --- a/boards/msba2-common/tools/obj/serial.d +++ /dev/null @@ -1,3 +0,0 @@ -obj/serial.d: src/serial.c src/serial.h - -src/serial.h: diff --git a/boards/msba2-common/tools/obj/uuencode.d b/boards/msba2-common/tools/obj/uuencode.d deleted file mode 100644 index 548a00f642..0000000000 --- a/boards/msba2-common/tools/obj/uuencode.d +++ /dev/null @@ -1,3 +0,0 @@ -obj/uuencode.d: src/uuencode.c src/uuencode.h - -src/uuencode.h: From e63ece0c189caba33cdf6133daf51285db7736b0 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Fri, 31 Jan 2014 17:08:19 +0100 Subject: [PATCH 3/3] add obj/*.d to clean target --- boards/msba2-common/tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/msba2-common/tools/Makefile b/boards/msba2-common/tools/Makefile index 05db7a8f5f..442d751691 100644 --- a/boards/msba2-common/tools/Makefile +++ b/boards/msba2-common/tools/Makefile @@ -40,7 +40,7 @@ boot_23xx.c boot_23xx.h: src/boot_23xx.armasm mkbootc arm-none-eabi-objdump -d obj/boot_23xx.armobj | ./mkbootc boot_23xx clean: - rm -f bin/lpc2k_pgm cksum_test obj/*.o core core.* obj/*.armobj bin/pseudoterm + rm -f bin/lpc2k_pgm cksum_test obj/*.o obj/*.d core core.* obj/*.armobj bin/pseudoterm install: install -m 0755 bin/lpc2k_pgm $(prefix)/bin