diff options
Diffstat (limited to 'rbutil/mkamsboot')
-rw-r--r-- | rbutil/mkamsboot/dualboot/Makefile | 10 | ||||
-rw-r--r-- | rbutil/mkamsboot/dualboot/bin2c.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/rbutil/mkamsboot/dualboot/Makefile b/rbutil/mkamsboot/dualboot/Makefile index 94ec718574..8a441c9237 100644 --- a/rbutil/mkamsboot/dualboot/Makefile +++ b/rbutil/mkamsboot/dualboot/Makefile | |||
@@ -7,9 +7,7 @@ CC=gcc | |||
7 | BOOTOBJS = nrv2e_d8.o dualboot_clip.o dualboot_e200v2.o dualboot_c200v2.o dualboot_m200v4.o dualboot_fuze.o dualboot_clipv2.o dualboot_clipplus.o | 7 | BOOTOBJS = nrv2e_d8.o dualboot_clip.o dualboot_e200v2.o dualboot_c200v2.o dualboot_m200v4.o dualboot_fuze.o dualboot_clipv2.o dualboot_clipplus.o |
8 | BOOTBINS = nrv2e_d8.arm-bin dualboot_clip.arm-bin dualboot_e200v2.arm-bin dualboot_c200v2.arm-bin dualboot_m200v4.arm-bin dualboot_fuze.arm-bin dualboot_clipv2.arm-bin dualboot_clipplus.arm-bin | 8 | BOOTBINS = nrv2e_d8.arm-bin dualboot_clip.arm-bin dualboot_e200v2.arm-bin dualboot_c200v2.arm-bin dualboot_m200v4.arm-bin dualboot_fuze.arm-bin dualboot_clipv2.arm-bin dualboot_clipplus.arm-bin |
9 | 9 | ||
10 | all: dualboot.h | 10 | all: ../dualboot.h ../dualboot.c |
11 | |||
12 | dualboot.h: $(BOOTBINS) | ||
13 | 11 | ||
14 | # Dualboot bootloaders | 12 | # Dualboot bootloaders |
15 | 13 | ||
@@ -47,11 +45,11 @@ nrv2e_d8.o: nrv2e_d8.S | |||
47 | %.arm-bin: %.arm-elf | 45 | %.arm-bin: %.arm-elf |
48 | arm-elf-objcopy -O binary $< $@ | 46 | arm-elf-objcopy -O binary $< $@ |
49 | 47 | ||
50 | dualboot.c dualboot.h: $(BOOTBINS) bin2c | 48 | ../dualboot.c ../dualboot.h: $(BOOTBINS) bin2c |
51 | ./bin2c dualboot $(BOOTBINS) | 49 | ./bin2c ../dualboot $(BOOTBINS) |
52 | 50 | ||
53 | bin2c: bin2c.c | 51 | bin2c: bin2c.c |
54 | $(CC) -o bin2c bin2c.c | 52 | $(CC) -o bin2c bin2c.c |
55 | 53 | ||
56 | clean: | 54 | clean: |
57 | rm -f *~ bin2c $(BOOTBINS) $(BOOTOBJS) dualboot.c dualboot.h | 55 | rm -f *~ bin2c $(BOOTBINS) $(BOOTOBJS) |
diff --git a/rbutil/mkamsboot/dualboot/bin2c.c b/rbutil/mkamsboot/dualboot/bin2c.c index 9a8c9c7dfe..830224c35a 100644 --- a/rbutil/mkamsboot/dualboot/bin2c.c +++ b/rbutil/mkamsboot/dualboot/bin2c.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #include <fcntl.h> | 27 | #include <fcntl.h> |
28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
29 | #include <libgen.h> | ||
29 | 30 | ||
30 | #ifndef O_BINARY | 31 | #ifndef O_BINARY |
31 | #define O_BINARY 0 | 32 | #define O_BINARY 0 |
@@ -90,7 +91,7 @@ int main (int argc, char* argv[]) | |||
90 | } | 91 | } |
91 | 92 | ||
92 | fprintf(cfile,"/* Generated by bin2c */\n\n"); | 93 | fprintf(cfile,"/* Generated by bin2c */\n\n"); |
93 | fprintf(cfile,"#include \"%s\"\n\n", hfilename); | 94 | fprintf(cfile,"#include \"%s\"\n\n", basename(hfilename)); |
94 | fprintf(hfile,"/* Generated by bin2c */\n\n"); | 95 | fprintf(hfile,"/* Generated by bin2c */\n\n"); |
95 | 96 | ||
96 | for(i=0; i < argc - 2; i++) { | 97 | for(i=0; i < argc - 2; i++) { |