X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fat91sam7s%2Fat91sam7s.mk;h=0d14890a5be2a84311ec9c28b42c8a8c78936a8e;hb=bcae0651fa1edd3078cdac75afe2f4b6ad0361c3;hp=bfa4795718687f40fc8ff83a3af74953e8934c49;hpb=0ace0d776cdbb34ed7f4aaa0815d4e2dd46fcec7;p=bertos.git

diff --git a/app/at91sam7s/at91sam7s.mk b/app/at91sam7s/at91sam7s.mk
index bfa47957..0d14890a 100644
--- a/app/at91sam7s/at91sam7s.mk
+++ b/app/at91sam7s/at91sam7s.mk
@@ -5,11 +5,10 @@
 #
 # Makefile fragment for DevLib at91sam7s application.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
 #
 
-
 # Set to 1 for debug builds
 at91sam7s_DEBUG = 1
 
@@ -18,31 +17,28 @@ TRG += at91sam7s
 
 at91sam7s_CSRC = \
 	app/at91sam7s/at91sam7s.c \
-	drv/timer.c \
-	drv/ser.c \
-	cpu/arm/drv/sysirq_at91.c \
-	cpu/arm/drv/ser_at91.c \
-	mware/event.c \
-	mware/formatwr.c \
-	mware/hex.c \
-	kern/proc.c \
-	kern/proc_test.c \
-	kern/monitor.c \
-	kern/signal.c \
+	bertos/drv/timer.c \
+	bertos/drv/ser.c \
+	bertos/cpu/arm/drv/sysirq_at91.c \
+	bertos/cpu/arm/drv/ser_at91.c \
+	bertos/mware/event.c \
+	bertos/mware/formatwr.c \
+	bertos/mware/hex.c \
+	bertos/kern/kfile.c \
+	bertos/kern/proc.c \
+	bertos/kern/proc_test.c \
+	bertos/kern/monitor.c \
+	bertos/kern/signal.c
 
 at91sam7s_CPPASRC = \
-	cpu/arm/hw/crtat91sam7s256_rom.S \
-	kern/switch_arm.S
+	bertos/cpu/arm/hw/crtat91sam7_rom.S \
+	bertos/cpu/arm/hw/switch_arm.S
+
+at91sam7s_CROSS = arm-elf-
 
 at91sam7s_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug
-at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Icpu/arm
-at91sam7s_LDFLAGS = -nostartfiles -T cpu/arm/scripts/at91sam7s256_ram.ld -Wl,--no-warn-mismatch
+at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Ibertos/cpu/arm
+at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch
 
 at91sam7s_CPU = arm7tdmi
 
-# Debug stuff
-ifeq ($(at91sam7s_DEBUG),1)
-	at91sam7s_CFLAGS += -D_DEBUG
-	at91sam7s_CSRC += drv/kdebug.c
-endif
-