Only in R67CDR.BACK/kernel/fiasco/src/drivers/arm: processor-armCDR.cpp
diff -r -u foc-upstream/kernel/fiasco/src/drivers/arm/processor-arm.cpp R67CDR.BACK/kernel/fiasco/src/drivers/arm/processor-arm.cpp
--- foc-upstream/kernel/fiasco/src/drivers/arm/processor-arm.cpp	2015-01-21 18:06:22.000000000 +0800
+++ R67CDR.BACK/kernel/fiasco/src/drivers/arm/processor-arm.cpp	2015-06-08 10:55:20.678425000 +0800
@@ -32,7 +32,8 @@
   static Cpu_phys_id cpu_id();
 };
 
-INTERFACE[arm && !arm_em_tz]:
+//INTERFACE[arm && !arm_em_tz]:
+INTERFACE[arm && !arm_em_tz && !arm_em_ns]:
 
 EXTENSION class Proc
 {
@@ -62,6 +63,21 @@
     };
 };
 
+INTERFACE[arm && arm_em_ns]:
+
+EXTENSION class Proc
+{
+public:
+  enum : unsigned
+    {
+      Cli_mask                = Status_IRQ_disabled,
+      Sti_mask                = Status_IRQ_disabled,
+      Status_preempt_disabled = Status_IRQ_disabled,
+      Status_interrupts_mask  = Status_IRQ_disabled,
+      Status_always_mask      = 0x10 | Status_FIQ_disabled,
+    };
+};
+
 INTERFACE[arm && !hyp]:
 
 EXTENSION class Proc
diff -r -u foc-upstream/l4/Makefile R67CDR.BACK/l4/Makefile
--- foc-upstream/l4/Makefile	2015-01-21 18:06:22.000000000 +0800
+++ R67CDR.BACK/l4/Makefile	2015-06-08 11:14:51.322379000 +0800
@@ -396,7 +396,7 @@
 	echo "# File semi-automatically generated by 'make switch_ram_base'" > $(OBJ_BASE)/Makeconf.ram_base; \
 	echo "RAM_BASE := $(1)"                                             >> $(OBJ_BASE)/Makeconf.ram_base; \
 	PWD=$(PWD)/pkg/sigma0/server/src $(MAKE) RAM_BASE=$(1) -C pkg/sigma0/server/src;                      \
-	PWD=$(PWD)/pkg/moe/server/src    $(MAKE) RAM_BASE=$(1) -C pkg/moe/server/src;                         \
+	#PWD=$(PWD)/pkg/moe/server/src    $(MAKE) RAM_BASE=$(1) -C pkg/moe/server/src;                         \
 	echo "RAM_BASE_SWITCH_OK := yes"                                    >> $(OBJ_BASE)/Makeconf.ram_base
 endef
 
diff -r -u foc-upstream/l4/mk/platforms/exynos4.conf R67CDR.BACK/l4/mk/platforms/exynos4.conf
--- foc-upstream/l4/mk/platforms/exynos4.conf	2015-01-21 18:06:22.000000000 +0800
+++ R67CDR.BACK/l4/mk/platforms/exynos4.conf	2015-06-08 11:18:15.750370000 +0800
@@ -1,4 +1,4 @@
 PLATFORM_NAME        = "Samsung Exynos4"
 PLATFORM_ARCH        = arm
 PLATFORM_RAM_BASE    = 0x40000000
-PLATFORM_RAM_SIZE_MB = 1024
+PLATFORM_RAM_SIZE_MB = 2047