From 3dae33fd24729a77161216f9bfde4f7ea9e7b6ce Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 26 Mar 2012 14:45:42 +0000 Subject: move config values out of makefile --- kernel/Makefile.inc | 4 ++-- kernel/dmx/Makefile | 2 -- kernel/kernel.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'kernel') diff --git a/kernel/Makefile.inc b/kernel/Makefile.inc index cfd29d0..34183a8 100644 --- a/kernel/Makefile.inc +++ b/kernel/Makefile.inc @@ -4,13 +4,13 @@ SRCS+= kernel.c +MCU= atmega328p CC= avr-gcc OBJCOPY= avr-objcopy OBJDUMP= avr-objdump SIZE= avr-size -CFLAGS= -mmcu=${MCU} -Wall -Os \ - -DF_CPU=${F_CPU} -DPRESCALE=${PRESCALE} +CFLAGS= -mmcu=${MCU} -Wall -Os -DF_CPU=${F_CPU} LDFLAGS= -mmcu=${MCU} -Wl,-Map,${PROG}.map .SUFFIXES: .lst .hex .bin .srec .ehex .ebin .esrec diff --git a/kernel/dmx/Makefile b/kernel/dmx/Makefile index 3f29e14..acba198 100644 --- a/kernel/dmx/Makefile +++ b/kernel/dmx/Makefile @@ -1,8 +1,6 @@ # $Id$ -MCU= atmega328p F_CPU= 20000000 -PRESCALE= 1 PROG= dmx SRCS= dmx.c heartbeat.c rgb.c hsv.c clock.c lcd3.c uart.c adc.c ctrl.c diff --git a/kernel/kernel.h b/kernel/kernel.h index 12c5629..c829e2b 100644 --- a/kernel/kernel.h +++ b/kernel/kernel.h @@ -28,7 +28,6 @@ #endif #ifndef PRESCALE -#warning PRESCALE not set, fallback to default: 1 #define PRESCALE 1 #endif -- cgit v1.2.3