diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 51afd3ad03..aada524f48 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-17	Miao Yan <yanmiaobest@gmail.com>
+
+	* optman/Makefile.am, optman/preinstall.am: Merge GSOC project code to
+	add simple device only filesystem (devfs), optionally completely drop
+	out filesystem, and to clean up disabling newlib reentrancy support.
+	This dropped 17K from the minimum.exe for sparc/sis and arm/rtl22xx_t
+	now has a 15K code space.
+	* optman/no-console.c, optman/no-filesystem.c, optman/no-libio.c:
+	Removed.
+
 2008-09-08 	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libchip/ide/ata.h: Convert to Unix file format.
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index 98d548daba..7560f32d9f 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -73,15 +73,5 @@ no_timer_rel_SOURCES = rtems/no-timer.c
 no_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 no_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-project_lib_PROGRAMS += no-filesystem.rel
-no_filesystem_rel_SOURCES = no-filesystem.c no-libio.c
-no_filesystem_rel_CPPFLAGS = $(AM_CPPFLAGS)
-no_filesystem_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_PROGRAMS += no-console.rel
-no_console_rel_SOURCES = no-console.c
-no_console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-no_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/optman/no-console.c b/c/src/optman/no-console.c
deleted file mode 100644
index 4f30ad32d9..0000000000
--- a/c/src/optman/no-console.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Console Initialization Stub 
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-void open_dev_console(void)
-{
-}
-
diff --git a/c/src/optman/no-filesystem.c b/c/src/optman/no-filesystem.c
deleted file mode 100644
index 69d4b18c45..0000000000
--- a/c/src/optman/no-filesystem.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Stub Base file system initialization
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/libio_.h>
-
-rtems_user_env_t  rtems_global_user_env;
-rtems_user_env_t *rtems_current_user_env;
-
-/*
- *  rtems_filesystem_initialize
- *
- *  Initialize the foundation of the file system.  It is an empty function.
- */
-
-void rtems_filesystem_initialize( void )
-{
-}
diff --git a/c/src/optman/no-libio.c b/c/src/optman/no-libio.c
deleted file mode 100644
index de0b26cd5a..0000000000
--- a/c/src/optman/no-libio.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Stub Base libio initialization
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/libio_.h>               /* libio_.h pulls in rtems */
-#include <rtems.h>
-#include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-
-#include <stdio.h>                      /* O_RDONLY, et.al. */
-#include <fcntl.h>                      /* O_RDONLY, et.al. */
-#include <assert.h>
-#include <errno.h>
-
-#include <errno.h>
-#include <string.h>                     /* strcmp */
-#include <unistd.h>
-#include <stdlib.h>                     /* calloc() */
-
-#include <rtems/libio.h>                /* libio.h not pulled in by rtems */
-
-/*
- *  File descriptor Table Information
- */
-
-extern uint32_t    rtems_libio_number_iops;
-rtems_id           rtems_libio_semaphore;
-rtems_libio_t     *rtems_libio_iops;
-rtems_libio_t     *rtems_libio_iop_freelist;
-
-/*
- *  rtems_libio_init
- *
- *  Called by BSP startup code to initialize the libio subsystem.
- */
-void rtems_libio_init( void )
-{
-}
diff --git a/c/src/optman/preinstall.am b/c/src/optman/preinstall.am
index f300fa4c02..7b82b63d6b 100644
--- a/c/src/optman/preinstall.am
+++ b/c/src/optman/preinstall.am
@@ -70,11 +70,3 @@ $(PROJECT_LIB)/no-timer.rel: no-timer.rel $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-timer.rel
 TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer.rel
 
-$(PROJECT_LIB)/no-filesystem.rel: no-filesystem.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-filesystem.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-filesystem.rel
-
-$(PROJECT_LIB)/no-console.rel: no-console.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-console.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-console.rel
-