===================================================================
RCS file: /cvs/funnyos/kern/kern_main.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -r1.3 -r1.6
--- funnyos/kern/kern_main.c	2007/11/06 22:59:35	1.3
+++ funnyos/kern/kern_main.c	2007/11/24 20:57:46	1.6
@@ -1,10 +1,11 @@
 /*
- * $Id: kern_main.c,v 1.3 2007/11/06 22:59:35 init Exp $
+ * $Id: kern_main.c,v 1.6 2007/11/24 20:57:46 nbrk Exp $
  */
 #include <sys/types.h>
 #include <sys/kern_devconfig.h>
 #include <sys/mem.h>
 #include <sys/kern_time.h>
+#include <sys/kern_sched.h>
 
 #include <libkern/printf.h>
 
@@ -14,16 +15,23 @@
 void
 main(void)
 {
-	/* set up boot console */
-	config_consinit();
+	/* set up critical devices */
+	config_machineinit();
 
+	printf("Welcome to FunnyOS!\n");
+
 	/* initialize kmalloc */
 	kmem_init();
 
 	/* attach all devices described in arch/${ARCH}/config.c */
 	devconfig_recurse();
 
-	/* initialise system clock; this will start interrupts from timer */
+#ifndef ARCH_SAM7S64
+	/* initialize scheduler before enabling system ticks */
+	sched_init();
+#endif
+
+	/* initialize system clock; this will start interrupts from timer */
 	sysclock_init();
 
 	while(1)