Minor (mostly harmless) pthread fixes
[akaros.git] / Makeconfig
index cbef09c..694c7f1 100644 (file)
@@ -3,12 +3,14 @@
 # To enable any of these options, add a line like the following to your Makelocal
 # CFLAGS += $(CONFIG_APPSERVER)
 CONFIG_APPSERVER:=                 -D__CONFIG_APPSERVER__
+CONFIG_OSDI:=                      -D__CONFIG_OSDI__
 
 # Kernel configuration parameters
 # By default, each of these options will be turned off
 # To enable any of these options, add a line like the following to your Makelocal
 # KERN_CFLAGS += $(CONFIG_KFS) $(CONFIG_BSD_ON_CORE0)
 CONFIG_KFS:=                       -D__CONFIG_KFS__
+CONFIG_DEDICATED_MONITOR:=         -D__CONFIG_DEDICATED_MONITOR__
 CONFIG_SINGLE_CORE:=               -D__CONFIG_SINGLE_CORE__
 CONFIG_NETWORKING:=                -D__CONFIG_NETWORKING__
 CONFIG_SERIAL_IO:=                 -D__CONFIG_SERIAL_IO__
@@ -16,12 +18,21 @@ CONFIG_BSD_ON_CORE0:=              -D__CONFIG_BSD_ON_CORE0__
 CONFIG_SPINLOCK_DEBUG:=            -D__CONFIG_SPINLOCK_DEBUG__
 CONFIG_PAGE_COLORING:=             -D__CONFIG_PAGE_COLORING__
 CONFIG_DEMAND_PAGING:=             -D__CONFIG_DEMAND_PAGING__
+CONFIG_NOMTRRS:=                   -D__CONFIG_NOMTRRS__
+CONFIG_E1000_MMIO_HACK:=           -D__CONFIG_E1000_MMIO_HACK__
+CONFIG_E1000_ON_BOXBORO:=          -DE1000_MMIO_ADDR=0x9bb20000
+CONFIG_E1000_ON_S142:=             -DE1000_MMIO_ADDR=0xfbee0000
+CONFIG_DISABLE_MPTABLES:=          -D__CONFIG_DISABLE_MPTABLES__
+CONFIG_EXPER_TRADPROC:=            -D__CONFIG_EXPER_TRADPROC__
+CONFIG_MONITOR_ON_INT:=            -D__CONFIG_MONITOR_ON_INT__
+CONFIG_DISABLE_SMT:=               -D__CONFIG_DISABLE_SMT__
 
 # Userspace configuration parameters
 # By default, each of these options will be turned off
 # To enable any of these options, add a line like the following to your Makelocal
 # USER_CFLAGS += $(CONFIG_SYSCALL_TRAP)
 CONFIG_SYSCALL_TRAP:=              -D__CONFIG_SYSCALL_TRAP__
+CONFIG_USER_DEBUGINFO:=            -g
 
 # User tests configuration parameters
 # By default, each of these options will be turned off