From 87a3f5056e2b0311fc978fe9059b124488690788 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 8 Jan 2012 11:53:17 +0100 Subject: DFU: put Chip Unique ID into USB serial number string --- usb-dfu-experiment/Makefile | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'usb-dfu-experiment/Makefile') diff --git a/usb-dfu-experiment/Makefile b/usb-dfu-experiment/Makefile index f273c65..95dd5b3 100644 --- a/usb-dfu-experiment/Makefile +++ b/usb-dfu-experiment/Makefile @@ -120,17 +120,15 @@ VPATH += $(UTILITY) VPATH += $(PERIPH)/dbgu VPATH += $(PERIPH)/pio VPATH += $(PERIPH)/irq -VPATH += $(PERIPH)/ssc -VPATH += $(PERIPH)/twi VPATH += $(PERIPH)/pmc VPATH += $(PERIPH)/cp15 VPATH += $(BOARDS)/$(BOARD) VPATH += $(BOARDS)/$(BOARD)/$(CHIP) -VPATH += $(DRIVER)/twi -VPATH += $(PERIPH)/mci +VPATH += $(PERIPH)/eefc VPATH += $(PERIPH)/dma VPATH += $(DRIVER)/dmad VPATH += $(EXT_LIBS)/cmsis +VPATH += $(AT91LIB)/memories/flash VPATH += $(USB)/device/core VPATH += $(USB)/device/dfu @@ -140,6 +138,7 @@ VPATH += $(USB)/common/audio # Objects built from C source files C_OBJECTS += main.o C_OBJECTS += dfu_desc.o +C_OBJECTS += sam3u_chipid_usbserial.o C_OBJECTS += USBD_UDPHS.o C_OBJECTS += USBDDriver.o C_OBJECTS += USBDCallbacks_Initialized.o @@ -161,17 +160,15 @@ C_OBJECTS += dfu_driver.o C_OBJECTS += dbgu.o C_OBJECTS += pio.o C_OBJECTS += pio_it.o -C_OBJECTS += ssc.o -C_OBJECTS += twi.o C_OBJECTS += pmc.o C_OBJECTS += led.o -C_OBJECTS += twid.o C_OBJECTS += string.o C_OBJECTS += stdio.o C_OBJECTS += math.o C_OBJECTS += trace.o C_OBJECTS += board_memories.o C_OBJECTS += board_lowlevel.o +C_OBJECTS += flashd_eefc.o eefc.o # Objects for different chips @@ -185,14 +182,6 @@ C_OBJECTS += aic.o C_OBJECTS += cp15.o endif -ifeq ($(CHIP_IP_MCI), MCI_DMA) -C_OBJECTS += dmad.o -C_OBJECTS += dma.o -C_OBJECTS += mci_hs.o -else -C_OBJECTS += mci.o -endif - # Objects built from Assembly source files ifneq ($(CHIP_CORE), cortexm3) ASM_OBJECTS += board_cstartup.o -- cgit v1.2.3