Commit eb839408 authored by Colin González's avatar Colin González
Browse files

Removed references to old directories

parent ff7a18bd
......@@ -112,8 +112,8 @@ UTILITY = $(AT91LIB)/utility
PERIPH = $(AT91LIB)/peripherals
BOARDS = $(AT91LIB)/boards
PORT = $(FREERTOS)/portable/GCC/ARM9_AT91SAM9G20
MEM_MGT = $(FREERTOS)/portable/MemMang
PORT = $(FREERTOS)/src/portable/GCC/ARM9_AT91SAM9G20
MEM_MGT = $(FREERTOS)/src/portable/MemMang
VPATH = src/
VPATH += $(UTILITY)
......@@ -159,12 +159,8 @@ C_OBJECTS += event_groups.o
C_OBJECTS += list.o
C_OBJECTS += stream_buffer.o
C_OBJECTS += timers.o
<<<<<<< HEAD
C_OBJECTS += heap_1.o
=======
C_OBJECTS += standardMemMang.o
C_OBJECTS += hooks.o
>>>>>>> 3627358... Removed old test files
# Objects build from assembly source files
ASM_OBJECTS = board_fstartup.o
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment