Changeset 36a140b in mainline

Timestamp:

2005-11-08T12:38:52Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

789b5cc

Parents:

5f85c91

Message:

build system: CONFIG_TEST, CONFIG_USERSPACE

Files:

• Makefile (modified) (2 diffs)
• Makefile.config (modified) (1 diff)
• generic/src/main/kinit.c (modified) (3 diffs)

Makefile

@@ -65 +65 @@
         DEFS += -DCONFIG_DEBUG_SPINLOCK
 endif
+ifeq ($(CONFIG_USERSPACE),y)
+        DEFS += -DCONFIG_USERSPACE
+endif
 
 ## Toolchain configuration
@@ -120 +123 @@
         generic/src/fb/font-8x16.c
 
+## Test sources
+#
+
+ifneq ($(CONFIG_TEST),)
+        DEFS += -DCONFIG_TEST
+        GENERIC_SOURCES += test/$(CONFIG_TEST)/test.c
+endif
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))

Makefile.config

@@ -26 +26 @@
 CONFIG_DEBUG = n
 CONFIG_DEBUG_SPINLOCK = y
+
+## Run-time configuration directives
+#
+# CONFIG_USERSPACE (n/y)
+#       Enable user space support
+#
+# CONFIG_TEST (value)
+#       Compile in test "value" (empty string for no test)
+#
+
+CONFIG_USERSPACE = n
+CONFIG_TEST =
+#CONFIG_TEST = synch/rwlock1/
+#CONFIG_TEST = synch/rwlock2/
+#CONFIG_TEST = synch/rwlock3/
+#CONFIG_TEST = synch/rwlock4/
+#CONFIG_TEST = synch/rwlock5/
+#CONFIG_TEST = synch/semaphore1/
+#CONFIG_TEST = synch/semaphore2/
+#CONFIG_TEST = fpu/fpu1/
+#CONFIG_TEST = fpu/sse1/
+#CONFIG_TEST = fpu/mips1/
+#CONFIG_TEST = print/print1/
+#CONFIG_TEST = thread/thread1/
+#CONFIG_TEST = mm/mapping1/

generic/src/main/kinit.c

@@ -51 +51 @@
 #include <synch/spinlock.h>
 
-#ifdef __TEST__
+#ifdef CONFIG_TEST
 #include <test.h>
-#endif /* __TEST__ */
+#endif /* CONFIG_TEST */
 
 #include <mm/frame.h>
@@ -118 +118 @@
         interrupts_enable();
 
-#ifdef __USERSPACE__
+#ifdef CONFIG_USERSPACE
         /*
          * Create the first user task.
@@ -150 +150 @@
         
         thread_ready(t);
-#endif /* __USERSPACE__ */
+#endif /* CONFIG_USERSPACE */
 
-#ifdef __TEST__
+#ifdef CONFIG_TEST
         test();
-#endif /* __TEST__ */
+#endif /* CONFIG_TEST */