aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-03-26 14:45:42 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-03-26 14:45:42 +0000
commit3dae33fd24729a77161216f9bfde4f7ea9e7b6ce (patch)
treecf524c3f00bec489ef52f033489c3aa21c3aa656 /kernel
parent9e1e6f70ec0fc2fae15c4aab0f78f93e75f8dc46 (diff)
move config values out of makefile
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile.inc4
-rw-r--r--kernel/dmx/Makefile2
-rw-r--r--kernel/kernel.h1
3 files changed, 2 insertions, 5 deletions
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