update

[l4.git] / kernel / fiasco / src / templates / globalconfig.out.arm-rv-4-noinl

diff --git a/kernel/fiasco/src/templates/globalconfig.out.arm-rv-4-noinl b/kernel/fiasco/src/templates/globalconfig.out.arm-rv-4-noinl
index 165ac42a021231af7c0799b3511d8cde53dd67c8..29a746c3d21c878ed4af8676f212cd8f9d679949 100644 (file)
--- a/kernel/fiasco/src/templates/globalconfig.out.arm-rv-4-noinl
+++ b/kernel/fiasco/src/templates/globalconfig.out.arm-rv-4-noinl
@@ -1,6 +1,5 @@
 #
-# Automatically generated make config: don't edit
-#
+# Automatically generated file; DO NOT EDIT.
 
 #
 # Target configuration
@@ -12,15 +11,18 @@ CONFIG_PF_REALVIEW=y
 # CONFIG_PF_IMX is not set
 # CONFIG_PF_S3C2410 is not set
 # CONFIG_PF_TEGRA2 is not set
-# CONFIG_PF_OMAP3 is not set
+# CONFIG_PF_OMAP 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="realview"
 CONFIG_PF_REALVIEW_EB=y
 # CONFIG_PF_REALVIEW_PB11MP is not set
 # CONFIG_PF_REALVIEW_PBX is not set
+# CONFIG_PF_REALVIEW_VEXPRESS is not set
 CONFIG_PF_REALVIEW_RAM_PHYS_BASE=0x0
 CONFIG_ABI_VF=y
 CONFIG_CAN_ARM_CPU_926=y
@@ -34,7 +36,9 @@ CONFIG_ARM_926=y
 # CONFIG_ARM_CORTEX_A8 is not set
 # CONFIG_ARM_CORTEX_A9 is not set
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
+CONFIG_ARM_EM_STD=y
 # CONFIG_FPU is not set
+CONFIG_ARM_CPU_ERRATA=y
 
 #
 # Kernel options
@@ -69,7 +73,6 @@ CONFIG_CC="gcc"
 CONFIG_CXX="g++"
 CONFIG_HOST_CC="gcc"
 CONFIG_HOST_CXX="g++"
-# CONFIG_VERBOSE is not set
 # CONFIG_MAINTAINER_MODE is not set
 CONFIG_LABEL=""
 # CONFIG_EXPERIMENTAL is not set