From 9ff4e7d506adcf5c3cf8ef603279bd540c2e792b Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 24 Apr 2009 09:28:30 +0000
Subject: [PATCH] Fix kernel heap macros in bertos trunk.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2659 38d2e660-2303-0410-9eaa-f027e97ec537
---
 Makefile                          | 4 ++--
 bertos/cfg/cfg_proc.h             | 1 +
 examples/at91sam7s/at91sam7s.c    | 3 ++-
 examples/at91sam7s/cfg/cfg_proc.h | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1eb5c26e..78f7bf6c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ default: all
 include bertos/config.mk
 
 #Include subtargets
-include examples/demo/demo.mk
-#include examples/at91sam7s/at91sam7s.mk
+#include examples/demo/demo.mk
+include examples/at91sam7s/at91sam7s.mk
 #include examples/triface/triface.mk
 
 include bertos/rules.mk
diff --git a/bertos/cfg/cfg_proc.h b/bertos/cfg/cfg_proc.h
index b2337bf2..52e24526 100644
--- a/bertos/cfg/cfg_proc.h
+++ b/bertos/cfg/cfg_proc.h
@@ -57,6 +57,7 @@
  * Dynamic memory allocation for processes.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ supports = "False"
  */
 #define CONFIG_KERN_HEAP 0
 
diff --git a/examples/at91sam7s/at91sam7s.c b/examples/at91sam7s/at91sam7s.c
index f0c14a29..17293a44 100644
--- a/examples/at91sam7s/at91sam7s.c
+++ b/examples/at91sam7s/at91sam7s.c
@@ -45,6 +45,7 @@
 #include <drv/timer.h>
 #include <drv/sysirq_at91.h>
 #include <drv/ser.h>
+#include <drv/ntc.h>
 
 #include <io/arm.h>
 
@@ -71,7 +72,7 @@ static void leds_toggle(void)
 			roll = 1;
 
 		PIOA_SODR = a;
-		PIOA_CODR = a >> 1;	
+		PIOA_CODR = a >> 1;
 	}
 	else
 	{
diff --git a/examples/at91sam7s/cfg/cfg_proc.h b/examples/at91sam7s/cfg/cfg_proc.h
index 78a0447b..9f5f3a25 100644
--- a/examples/at91sam7s/cfg/cfg_proc.h
+++ b/examples/at91sam7s/cfg/cfg_proc.h
@@ -58,7 +58,7 @@
  * $WIZ$ type = "boolean"
  * $WIZ$ supports = "False"
  */
-#define CONFIG_KERN_HEAP 1
+#define CONFIG_KERN_HEAP 0
 
 /**
  * Preemptive process scheduling. WARNING: Experimental, still incomplete!
-- 
2.25.1