summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-15 21:26:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-15 21:26:11 +0000
commit9b9f8d0ef1d1b112870b149ee45581f350b5866a (patch)
tree0b3180af4d6b3f18e21164f9bb4fe3d2b421ad8c /misc
parentd7a14c53b95ca2c362704b395d26dd047f503aa8 (diff)
2010-04-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* x86_display_cpu/Makefile, x86_display_cpu/test.c: Clean up.
Diffstat (limited to 'misc')
-rw-r--r--misc/ChangeLog4
-rw-r--r--misc/x86_display_cpu/Makefile6
-rw-r--r--misc/x86_display_cpu/test.c1
3 files changed, 7 insertions, 4 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 4a9dd0e..2acf5fb 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * x86_display_cpu/Makefile, x86_display_cpu/test.c: Clean up.
+
2010-04-14 Joel Sherrill <joel.sherrill@oarcorp.com>
* x86_display_cpu/.cvsignore, x86_display_cpu/Makefile,
diff --git a/misc/x86_display_cpu/Makefile b/misc/x86_display_cpu/Makefile
index bc014cd..3ebe93a 100644
--- a/misc/x86_display_cpu/Makefile
+++ b/misc/x86_display_cpu/Makefile
@@ -12,15 +12,13 @@ PGM=${ARCH}/display_cpu.exe
MANAGERS=all
# C source names
-CSRCS = test.c
-COBJS = $(CSRCS:%.c=${ARCH}/%.o)
+SRCS = test.c
+OBJS = $(SRCS:%.[cS]=${ARCH}/%.o)
include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
include $(RTEMS_CUSTOM)
include $(PROJECT_ROOT)/make/leaf.cfg
-OBJS= $(COBJS) $(CXXOBJS) $(ASOBJS)
-
all: ${ARCH} $(PGM)
$(PGM): $(OBJS)
diff --git a/misc/x86_display_cpu/test.c b/misc/x86_display_cpu/test.c
index 10e08c4..a7a4a39 100644
--- a/misc/x86_display_cpu/test.c
+++ b/misc/x86_display_cpu/test.c
@@ -15,6 +15,7 @@ rtems_task Init(
printk( "\n\n*** x86 DISPLAY CPU CAPABILITIES TEST ***\n" );
printCpuInfo();
printk( "\n\n*** END OF x86 DISPLAY CPU CAPABILITIES TEST ***\n" );
+
exit( 0 );
}