update

[l4.git] / kernel / fiasco / src / templates / globalconfig.out.arm-imx6

diff --git a/kernel/fiasco/src/templates/globalconfig.out.arm-imx6 b/kernel/fiasco/src/templates/globalconfig.out.arm-imx6
index 904b99264433bc458e8ae0e48cd14fa30017e09d..09116d9df5e33e4443b4bf0d353320ded5b89307 100644 (file)
--- a/kernel/fiasco/src/templates/globalconfig.out.arm-imx6
+++ b/kernel/fiasco/src/templates/globalconfig.out.arm-imx6
@@ -12,10 +12,12 @@ CONFIG_PF_IMX=y
 # CONFIG_PF_S3C2410 is not set
 # CONFIG_PF_TEGRA2 is not set
 # CONFIG_PF_OMAP is not set
-# CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+# CONFIG_PF_SA1100 is not set
+# CONFIG_PF_EXYNOS is not set
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
+# CONFIG_PF_BCM2835 is not set
 CONFIG_BSP_NAME="imx"
 # CONFIG_PF_IMX_21 is not set
 # CONFIG_PF_IMX_35 is not set
@@ -28,7 +30,10 @@ CONFIG_CAN_ARM_CPU_CORTEX_A9=y
 CONFIG_CAN_ARM_CACHE_L2CXX0=y
 CONFIG_ARM_CORTEX_A9=y
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
-# CONFIG_ARM_CA9_ENABLE_SWP is not set
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
+# CONFIG_ARM_ENABLE_SWP is not set
 CONFIG_ARM_CACHE_L2CXX0=y
 CONFIG_FPU=y
 CONFIG_ARM_CPU_ERRATA=y
@@ -41,6 +46,7 @@ CONFIG_MP_MAX_CPUS=4
 CONFIG_CONTEXT_4K=y
 # CONFIG_FINE_GRAINED_CPUTIME is not set
 CONFIG_SCHED_FIXED_PRIO=y
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging