CHG: some minor adjustments.

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 220c21fcb753aa35140baccd525f6c2cb7e7e3bb..c5a698bdafda45c68890caa0a2f66e472bf2bf5b 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -14,12 +14,11 @@ APP_CFLAGS = -DWITH_ISO14443a_StandAlone \
                         -DWITH_LF \
                         -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS \
                         -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
                         -DWITH_LF \
                         -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS \
                         -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \

-#                       -DWITH_EMV \

 #                       -DWITH_LCD \
                         -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 #ifdef WITH_LCD                         
 #                       -DWITH_LCD \
                         -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 #ifdef WITH_LCD                         

-#SRC_LCD = fonts.c LCD.c
+SRC_LCD = fonts.c LCD.c

 #endif
 
 #ifdef WITH_LF
 #endif
 
 #ifdef WITH_LF


@@ -88,6 +87,8 @@ ARMSRC = fpgaloader.c \
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 

+COMMON_FLAGS =  -Os 
+

 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress
 
 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress
 

diff --git a/client/Makefile b/client/Makefile
index a56fd35bc56944b41e00c589b7604e71bccd14b8..72552fd1e00d7d63f38940bab3c3bfbb3205f58d 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -7,7 +7,8 @@ include ../common/Makefile.common
 
 CC = gcc
 CXX = g++
 
 CC = gcc
 CXX = g++

-COMMON_FLAGS =  -std=c99 -O3 -mpopcnt -march=native -g
+COMMON_FLAGS = -std=c99 -O3 -mpopcnt -march=native -g
+

 #VPATH = ../common ../zlib
 OBJDIR = obj
 
 #VPATH = ../common ../zlib
 OBJDIR = obj
 


@@ -81,10 +82,9 @@ else
     QTGUI = guidummy.o
 endif
 
     QTGUI = guidummy.o
 endif
 

-CORESRCS =     uart.c \
-               util.c \
-               sleep.c
-
+CORESRCS =  uart.c \
+                       util.c \
+                       sleep.c

 
 CMDSRCS =      mifarehost.c \
                        nonce2key/crapto1.c \
 
 CMDSRCS =      mifarehost.c \
                        nonce2key/crapto1.c \