fixed up the makefile and the symbol references in fbinit.c

This commit is contained in:
Amy G. Bowersox 2019-12-06 20:51:41 -07:00
parent 374f1d78eb
commit 6538ddeb53
3 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
*~ *~
*.o *.o
src/upiwin src/upiwin
src/splash.bin
buildutils/mksplash buildutils/mksplash

View File

@ -8,10 +8,10 @@ upiwin: $(OBJS)
gcc -c $(CFLAGS) $< gcc -c $(CFLAGS) $<
splash.o: splash.bin splash.o: splash.bin
ld -r -b binary --rename-section .data=.rodata,alloc,load,readonly,data,contents -o splash.o splash.bin objcopy -I binary -O elf32-littlearm -B arm --rename-section .data=.rodata,alloc,load,readonly,data,contents splash.bin splash.o
splash.bin: splash.png ../buildutils/mksplash splash.bin: splash.png ../buildutils/mksplash
../buildutils/mksplash splash.png splash.bin ../buildutils/mksplash splash.png splash.bin
clean: clean:
rm -f upiwin *.o *~ rm -f upiwin *.o splash.bin *~

View File

@ -11,9 +11,9 @@
#include "scode.h" #include "scode.h"
/* references to splash screen data in splash.o/splash.bin */ /* references to splash screen data in splash.o/splash.bin */
extern uint8_t _binary_splash_start[]; extern uint8_t _binary_splash_bin_start[];
extern uint8_t _binary_splash_end; extern uint8_t _binary_splash_bin_end;
extern uint8_t _binary_splash_size; extern uint8_t _binary_splash_bin_size;
static int fb_fd = -1; static int fb_fd = -1;