Merge pull request #109 from pwpiwi/image_shrink

Compress FPGA configs and initialized data

diff --cc armsrc/Makefile
index 502ab958c8aa3f6b3ab2ea35f3823122bcf4294c,78d67934b1c2c9bd84915ef46ccdf69c083ca84b..f21f106ce097442477aebb7fd06414a2f8179b15
--- 1/armsrc/Makefile
--- 2/armsrc/Makefile
+++ b/armsrc/Makefile
@@@ -17,10 -18,25 +18,25 @@@ APP_CFLAGS = -DWITH_LF -DWITH_ISO15693 
  SRC_LF = lfops.c hitag2.c lfsampling.c
  SRC_ISO15693 = iso15693.c iso15693tools.c
  SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
 -SRC_ISO14443b = iso14443.c
 +SRC_ISO14443b = iso14443b.c
  SRC_CRAPTO1 = crapto1.c crypto1.c des.c aes.c 
- SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c 
+ SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c
  
+ #the FPGA bitstream files. Note: order matters!
+ FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
+ 
+ #the zlib source files required for decompressing the fpga config at run time
+ SRC_ZLIB = inflate.c inffast.c inftrees.c adler32.c zutil.c
+ #additional defines required to compile zlib
+ ZLIB_CFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED
+ APP_CFLAGS += $(ZLIB_CFLAGS)
+ # zlib includes:
+ APP_CFLAGS += -I../zlib
+ 
+ # stdint.h provided locally until GCC 4.5 becomes C99 compliant
+ APP_CFLAGS += -I.
+ 
+ # Compile these in thumb mode (small size)
  THUMBSRC = start.c \
        $(SRC_LCD) \
        $(SRC_ISO15693) \

diff --cc armsrc/appmain.c
Simple merge

diff --cc armsrc/apps.h
Simple merge

diff --cc client/Makefile
index d7126da60efd9e3670a310b30816f5515bcf3d48,f9645194829c888a825da7dc545fee5f0af9710a..c454533d7822ca63febae2f6152a28f4480cb0bf
--- 1/client/Makefile
--- 2/client/Makefile
+++ b/client/Makefile
@@@ -102,8 -102,11 +102,12 @@@ CMDSRCS =        nonce2key/crapto1.c
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\
 +                      sha1.c\
  
+ ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
+ ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
+ #-DDEBUG -Dverbose=1
+ 
  
  COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
  CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)