SPI flash and makefile updated

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index ef0296a..3f71b77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ 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
 
 # LCD Driver (Only one can be included at a time!)
 OBJS += ILI9328.o


@@ -92,12 +92,16 @@ OBJS += mcp4725.o
 
 # RFID/NFC
 VPATH += drivers/sensors/pn532
 
 # RFID/NFC
 VPATH += drivers/sensors/pn532

-OBJS += pn532.o pn532_drvr_uart.o
+OBJS += pn532.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 +109,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 +128,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