Compile bootcode.bin and start.elf into rpiboot

This helps avoid picking up the wrong files when msd files have already been installed as a debian package

Compile bootcode.bin and start.elf into rpiboot
This helps avoid picking up the wrong files when msd files have already been installed as a debian package
Gordon Hollingworth
1 parent c3ee230e
Showing 2 changed files with 15 additions and 8 deletions
Makefile
main.c
-rpiboot: main.c
+rpiboot: main.c msd/bootcode.h msd/start.h
 	$(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0
+%.h: %.bin
+	xxd -i $< > $@
+
+%.h: %.elf
+	xxd -i $< > $@
+
 uninstall:
 	rm -f /usr/bin/rpiboot
 	rm -f /usr/share/rpiboot/usbbootcode.bin
@@ -5,6 +5,9 @@
 #include <unistd.h>
+#include "msd/bootcode.h"
+#include "msd/start.h"
+
 int signed_boot = 0;
 int verbose = 0;
 int loop = 0;
@@ -410,9 +413,11 @@ FILE * check_file(char * dir, char *fname)
 	if(fp == NULL)
 	{
-		strcpy(path, "/usr/share/rpiboot/msd/");
-		strcat(path, fname);
-		fp = fopen(path, "rb");
+		if(strcmp(fname, "bootcode.bin") == 0)
+			fp = fmemopen(msd_bootcode_bin, msd_bootcode_bin_len, "r");
+		else
+			if(strcmp(fname, "start.elf") == 0)
+				fp = fmemopen(msd_start_elf, msd_start_elf_len, "r");
 	}
 	return fp;
@@ -563,10 +568,6 @@ int main(int argc, char *argv[])
 #endif
-	// Default to standard msd directory
-	if(directory == NULL)
-		directory = "msd";
-
 	second_stage = check_file(directory, "bootcode.bin");
 	if(second_stage == NULL)
 	{