Switched row and col

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index ef0296a..14e1c26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,14 @@ SRAM_USB = 384
 VPATH = 
 OBJS = main.o
 
 VPATH = 
 OBJS = main.o
 

+##########################################################################
+# Debug settings
+##########################################################################
+
+# Set DEBUGBUILD to 'TRUE' for full debugging (larger, slower binaries), 
+# or to 'FALSE' for release builds (smallest, fastest binaries)
+DEBUGBUILD = FALSE
+

 ##########################################################################
 # Project-specific files 
 ##########################################################################
 ##########################################################################
 # Project-specific files 
 ##########################################################################


@@ -60,12 +68,13 @@ VPATH += drivers/lcd/tft/dialogues
 OBJS += drawing.o touchscreen.o bmp.o alphanumeric.o
 OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o
 OBJS += dejavusansmono8.o dejavusansmonobold8.o
 OBJS += drawing.o touchscreen.o bmp.o alphanumeric.o
 OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o
 OBJS += dejavusansmono8.o dejavusansmonobold8.o

-OBJS += veramono9.o veramonobold9.o veramono11.o veramonobold11.o 
+OBJS += verdana9.o verdana14.o verdanabold14.o 

 
 # LCD Driver (Only one can be included at a time!)
 OBJS += ILI9328.o
 # OBJS += ILI9325.o
 # OBJS += ssd1331.o
 
 # LCD Driver (Only one can be included at a time!)
 OBJS += ILI9328.o
 # OBJS += ILI9325.o
 # OBJS += ssd1331.o

+# OBJS += ssd1351.o

 # OBJS += st7735.o
 # OBJS += st7783.o
 
 # OBJS += st7735.o
 # OBJS += st7783.o
 


@@ -91,13 +100,18 @@ VPATH += drivers/dac/mcp4725
 OBJS += mcp4725.o
 
 # RFID/NFC
 OBJS += mcp4725.o
 
 # RFID/NFC

-VPATH += drivers/sensors/pn532
-OBJS += pn532.o pn532_drvr_uart.o
+VPATH += drivers/sensors/pn532 drivers/sensors/pn532/helpers
+OBJS += pn532.o pn532_bus_i2c.o pn532_bus_uart.o
+OBJS += pn532_mifare_classic.o pn532_mifare_ultralight.o

 
 # TAOS Light Sensors
 VPATH += drivers/sensors/tcs3414 drivers/sensors/tsl2561
 OBJS += tcs3414.o tsl2561.o
 
 
 # TAOS Light Sensors
 VPATH += drivers/sensors/tcs3414 drivers/sensors/tsl2561
 OBJS += tcs3414.o tsl2561.o
 

+# SPI Flash
+VPATH += drivers/spiflash/w25q16bv
+OBJS += w25q16bv.o
+

 ##########################################################################
 # Library files 
 ##########################################################################
 ##########################################################################
 # Library files 
 ##########################################################################


@@ -105,7 +119,7 @@ OBJS += tcs3414.o tsl2561.o
 VPATH += core core/adc core/cmd core/cpu core/gpio core/i2c core/pmu
 VPATH += core/ssp core/systick core/timer16 core/timer32 core/uart
 VPATH += core/usbhid-rom core/libc core/wdt core/usbcdc core/pwm
 VPATH += core core/adc core/cmd core/cpu core/gpio core/i2c core/pmu
 VPATH += core/ssp core/systick core/timer16 core/timer32 core/uart
 VPATH += core/usbhid-rom core/libc core/wdt core/usbcdc core/pwm

-VPATH += core/IAP
+VPATH += core/iap

 OBJS += adc.o cpu.o cmd.o gpio.o i2c.o pmu.o ssp.o systick.o timer16.o
 OBJS += timer32.o uart.o uart_buf.o usbconfig.o usbhid.o stdio.o string.o
 OBJS += wdt.o cdcuser.o cdc_buf.o usbcore.o usbdesc.o usbhw.o usbuser.o 
 OBJS += adc.o cpu.o cmd.o gpio.o i2c.o pmu.o ssp.o systick.o timer16.o
 OBJS += timer32.o uart.o uart_buf.o usbconfig.o usbhid.o stdio.o string.o
 OBJS += wdt.o cdcuser.o cdc_buf.o usbcore.o usbdesc.o usbhw.o usbuser.o 


@@ -124,6 +138,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 OUTFILE = firmware
 LPCRC = ./lpcrc
 OBJDUMP = $(CROSS_COMPILE)objdump
 OUTFILE = firmware
 LPCRC = ./lpcrc

+CP = cp

 
 ##########################################################################
 # GNU GCC compiler flags
 
 ##########################################################################
 # GNU GCC compiler flags


@@ -152,9 +167,14 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o
 ##########################################################################
 # Compiler settings, parameters and flags
 ##########################################################################
 ##########################################################################
 # Compiler settings, parameters and flags
 ##########################################################################

+ifeq (TRUE,$(DEBUGBUILD))
+  CFLAGS  = -c -g -O0 $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin
+  ASFLAGS = -c -g -O0 $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -D__ASSEMBLY__ -x assembler-with-cpp
+else
+  CFLAGS  = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin
+  ASFLAGS = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -D__ASSEMBLY__ -x assembler-with-cpp
+endif

 
 

-CFLAGS  = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -DTARGET=$(TARGET) -fno-builtin
-ASFLAGS = -c -g -Os $(INCLUDE_PATHS) -Wall -mthumb -ffunction-sections -fdata-sections -fmessage-length=0 -mcpu=$(CPU_TYPE) -D__ASSEMBLY__ -x assembler-with-cpp

 LDFLAGS = -nostartfiles -mthumb -mcpu=$(CPU_TYPE) -Wl,--gc-sections
 LDLIBS  = -lm
 OCFLAGS = --strip-unneeded
 LDFLAGS = -nostartfiles -mthumb -mcpu=$(CPU_TYPE) -Wl,--gc-sections
 LDLIBS  = -lm
 OCFLAGS = --strip-unneeded