From a05ccc9103d144667bbb3c31e2a081d7cafda21c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 26 Feb 2017 12:52:28 +0100 Subject: [PATCH] build efc.o and flashd.o as part of build process --- firmware/Makefile | 2 +- firmware/include_sam3s/chip.h | 2 ++ firmware/src_sam3s/efc.c | 1 + firmware/src_sam3s/flashd.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index 4eec868e..f1b45c12 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -145,7 +145,7 @@ VPATH += src_board src_sam3s cmsis $(USB_PATHS) src_simtrace src_libosmocore # Objects built from C source files C_CMSIS = core_cm3.o C_LOWLEVEL = board_cstartup_gnu.o board_lowlevel.o syscalls.o exceptions.o -C_LIBLEVEL = spi.o pio.o pmc.o usart.o pio_it.o pio_capture.o uart_console.o iso7816_4.o wdt.o led.o tc.o unique_id.o boardver_adc.o +C_LIBLEVEL = spi.o pio.o pmc.o usart.o pio_it.o pio_capture.o uart_console.o iso7816_4.o wdt.o efc.o flashd.o led.o tc.o unique_id.o boardver_adc.o C_CCID = cciddriver.o USBD.o USBDDriver.o USBD_HAL.o USBRequests.o USBDCallbacks.o USBDescriptors.o USBDDriverCallbacks.o C_SIMTRACE = simtrace_iso7816.o usb.o ccid.o sniffer.o mitm.o ringbuffer.o host_communication.o iso7816_fidi.o tc_etu.o req_ctx.o card_emu.o mode_cardemu.o i2c.o wwan_led.o wwan_perst.o C_OSMOCORE = timer.o rbtree.o diff --git a/firmware/include_sam3s/chip.h b/firmware/include_sam3s/chip.h index 3c25ce3b..e6af94e7 100644 --- a/firmware/include_sam3s/chip.h +++ b/firmware/include_sam3s/chip.h @@ -53,5 +53,7 @@ #include "trace.h" #include "wdt.h" #include "unique_id.h" +#include "efc.h" +#include "flashd.h" #endif /* _LIB_SAM3S_ */ diff --git a/firmware/src_sam3s/efc.c b/firmware/src_sam3s/efc.c index 97104d5e..b6a028e9 100644 --- a/firmware/src_sam3s/efc.c +++ b/firmware/src_sam3s/efc.c @@ -72,6 +72,7 @@ * Headers *----------------------------------------------------------------------------*/ #include "chip.h" +#include "efc.h" #include diff --git a/firmware/src_sam3s/flashd.c b/firmware/src_sam3s/flashd.c index 7dc7276c..6247139d 100644 --- a/firmware/src_sam3s/flashd.c +++ b/firmware/src_sam3s/flashd.c @@ -74,6 +74,8 @@ * Headers *----------------------------------------------------------------------------*/ #include "chip.h" +#include "flashd.h" +#include "efc.h" #include #include