Added separate toolchains for userspace and kernel.

config/cml/arm.ruleset

@@ -42,7 +42,8 @@ SCHED_TICKS		'Scheduler ticks per second'
 ICACHE_DISABLE		'Disable the L1 instruction cache'
 DCACHE_DISABLE		'Disable the L1 data cache'
 PREEMPT_DISABLE		'Disable Kernel Preemption'
-TOOLCHAIN		'Toolchain prefix for kernel'
+TOOLCHAIN_USERSPACE	'Toolchain prefix for userspace'
+TOOLCHAIN_KERNEL     	'Toolchain prefix for kernel'
 
 CAPABILITIES		'Enable capability checking'
 
@@ -100,7 +101,8 @@ menu kernel_generic_options
 	SCHED_TICKS%
 
 menu toolchain_menu
-	TOOLCHAIN$
+	TOOLCHAIN_USERSPACE$
+	TOOLCHAIN_KERNEL$
 
 menu main_menu
 	arch_type
@@ -194,7 +196,8 @@ require NCPU <= 4
 derive RAM_BASE_PLAT from  PLATFORM_BEAGLE ? 0x80000000 : 0x00000000
 
 # Toolchains:
-default TOOLCHAIN from 'arm-none-eabi-'
+default TOOLCHAIN_USERSPACE from 'arm-none-linux-gnueabi-'
+default TOOLCHAIN_KERNEL from 'arm-none-eabi-'
 
 prefix CONFIG_
 

config/configuration.py

@@ -69,7 +69,8 @@ class configuration:
         self.platform = None
         self.cpu = None
         self.gcc_arch_flag = None
-        self.toolchain = None
+        self.toolchain_userspace = None
+	self.toolchain_kernel = None
         self.all = []
         self.containers = []
         self.ncontainers = 0
@@ -117,9 +118,16 @@ class configuration:
 
     # Extract kernel space toolchain from a name value pair
     def get_toolchain(self, name, val):
-        if name[:len("CONFIG_TOOLCHAIN")] == "CONFIG_TOOLCHAIN":
+        if name[:len("CONFIG_TOOLCHAIN_USERSPACE")] == \
+			"CONFIG_TOOLCHAIN_USERSPACE":
             parts = val.split("\"", 2)
-            self.toolchain = parts[1]
+            self.toolchain_userspace = parts[1]
+
+	if name[:len("CONFIG_TOOLCHAIN_KERNEL")] == \
+			"CONFIG_TOOLCHAIN_KERNEL":
+		parts = val.split("\"", 2)
+		self.toolchain_kernel = parts[1]
+
 
     # Extract number of containers
     def get_ncontainers(self, name, val):