Changes since April

Clean up of build directories.
Simplifications to capability model.

loader/libs/c/SConscript

@@ -9,13 +9,16 @@ from os.path import join
 
 # Get global paths
 PROJRELROOT = '../../../'
-
 sys.path.append(PROJRELROOT)
 
-from config.configuration import *
-from config.projpaths import *
+from scripts.config.configuration import *
+from scripts.config.projpaths import *
 
-Import('env', 'arch', 'platform', 'type')
+config = configuration_retrieve()
+arch = config.arch
+platform = config.platform
+
+Import('env', 'type')
 variant = type
 
 e = env.Clone()

loader/libs/c/SConstruct

@@ -5,7 +5,7 @@
 #  Copyright © 2009  B Labs Ltd
 
 import os, sys, shelve
-from configure import *
+from scripts.config.config_invoke import *
 
 variant = "baremetal"
 config = configuration_retrieve()

loader/libs/c/src/sys-baremetal/arch-arm/sys_fputc.c

@@ -5,7 +5,7 @@
  */
 #include <stdio.h>
 #include <l4/config.h>
-#include <libdev/uart.h>
+#include <dev/uart.h>
 
 int __fputc(int c, FILE *stream)
 {