arch/x86/defconfig: run through make oldconfig

zultron · May 20, 2015 · 6a01ed5 · 6a01ed5
1 parent c07e356
commit 6a01ed5
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/base/arch/x86/defconfig b/base/arch/x86/defconfig
@@ -3,7 +3,7 @@
 # RTAI/x86 configuration
 #
 CONFIG_MODULES=y
-CONFIG_RTAI_VERSION="4.0 (vulcano)"
+CONFIG_RTAI_VERSION="4.0.0 (unofficial)"
 
 #
 # General
@@ -21,8 +21,11 @@ CONFIG_RTAI_LINUXDIR="/usr/src/linux"
 CONFIG_RTAI_TESTSUITE=y
 CONFIG_RTAI_COMPAT=y
 # CONFIG_RTAI_EXTENDED is not set
-CONFIG_RTAI_LXRT_NO_INLINE=y
+CONFIG_RTAI_QUIET=y
+CONFIG_RTAI_STARTUP_LOAD=y
 # CONFIG_RTAI_LXRT_STATIC_INLINE is not set
+CONFIG_RTAI_LXRT_NO_INLINE=y
+CONFIG_RTAI_FORTIFY_SOURCE=""
 
 #
 # Machine (x86 / x86_64)
@@ -43,6 +46,8 @@ CONFIG_RTAI_CPUS="8"
 # CONFIG_RTAI_LONG_TIMED_LIST is not set
 CONFIG_RTAI_SCHED_LATENCY_SELFCALIBRATE=y
 CONFIG_RTAI_SCHED_LATENCY="0"
+CONFIG_RTAI_KERN_BUSY_ALIGN_RET_DELAY="0"
+CONFIG_RTAI_USER_BUSY_ALIGN_RET_DELAY="0"
 CONFIG_RTAI_SCHED_LXRT_NUMSLOTS="150"
 CONFIG_RTAI_MONITOR_EXECTIME=y
 CONFIG_RTAI_ALLOW_RR=y
@@ -51,7 +56,6 @@ CONFIG_RTAI_ALLOW_RR=y
 # CONFIG_RTAI_ALIGN_LINUX_PRIORITY is not set
 # CONFIG_RTAI_ONE_SHOT is not set
 CONFIG_RTAI_CAL_FREQS_FACT="0"
-CONFIG_RTAI_SCHED_8254_LATENCY="4700"
 
 #
 # Supported services
@@ -82,14 +86,14 @@ CONFIG_RTAI_KSTACK_HEAPSZ="512"
 # CONFIG_RTAI_TASK_SWITCH_SIGNAL is not set
 # CONFIG_RTAI_USI is not set
 CONFIG_RTAI_WD=y
+CONFIG_RTAI_MALLOC_HEAPSZ="2048"
 
 #
 # Add-ons
 #
 CONFIG_RTAI_COMEDI_LXRT=y
 CONFIG_RTAI_COMEDI_DIR="/usr/comedi"
 # CONFIG_RTAI_USE_COMEDI_LOCK is not set
-# CONFIG_RTAI_CPLUSPLUS is not set
 # CONFIG_RTAI_RTDM is not set
 
 #