diff --git a/.gitignore b/.gitignore index b28b2d3..eff2a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ *.o src/upiwin +src/splash.bin buildutils/mksplash diff --git a/src/Makefile b/src/Makefile index 30a6305..381f052 100644 --- a/src/Makefile +++ b/src/Makefile @@ -8,10 +8,10 @@ upiwin: $(OBJS) gcc -c $(CFLAGS) $< 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 ../buildutils/mksplash splash.png splash.bin clean: - rm -f upiwin *.o *~ + rm -f upiwin *.o splash.bin *~ diff --git a/src/fbinit.c b/src/fbinit.c index 79a2cde..c77706d 100644 --- a/src/fbinit.c +++ b/src/fbinit.c @@ -11,9 +11,9 @@ #include "scode.h" /* references to splash screen data in splash.o/splash.bin */ -extern uint8_t _binary_splash_start[]; -extern uint8_t _binary_splash_end; -extern uint8_t _binary_splash_size; +extern uint8_t _binary_splash_bin_start[]; +extern uint8_t _binary_splash_bin_end; +extern uint8_t _binary_splash_bin_size; static int fb_fd = -1;