X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=config.mk;h=5ace0dbdf4c0f90ac29b5b1553ecadb5ca9090d4;hb=faed9d33b0a6bd6c2376e313fa3b73512c545caa;hp=0d4c387c2e77ee9a9c9ef7f7b5b2e76fc853cc9f;hpb=db978d8c104700d20a99c5bc9711574bdb9589fe;p=bertos.git diff --git a/config.mk b/config.mk index 0d4c387c..5ace0dbd 100644 --- a/config.mk +++ b/config.mk @@ -3,13 +3,8 @@ # Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/) # All rights reserved. # -# Based on: -# GCC-AVR standard Makefile part 1 -# Volker Oth 1/2000 -# # Author: Bernardo Innocenti -# -# $Log$ +# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000 # # @@ -18,20 +13,6 @@ -include pgm_config.mk DPROG ?= -V -c stk500 -P /dev/ttyS0 -# AVR ISP dongle that blows up easily -#DPROG = -V -c stk500 -P /dev/ttyS0 -#DPROG = -V -c jtag2slow -#-P /dev/ttyUSB0 - -# STK200 parallel cable -#DPROG = -c stk200 -E noreset - -# JTAG ICE mkII -#DPROG = avarice --mkII -j usb -l - -# PonyProg serial programmer -#DPROG = -c dasa2 - # Set to 1 to build for embedded devices. # e.g. produce target.elf instead of target and target_nostrip EMBEDDED_TARGET = 1 @@ -54,6 +35,7 @@ CC = gcc CXX = g++ AS = $(CC) -x assembler-with-cpp LD = $(CC) +LDXX = $(CXX) OBJCOPY = objcopy STRIP = strip INSTALL = cp -a