Make sure debug variant output goes into a different log file.

c/src/lib/libbsp/powerpc/psim/console/console.c

@@ -196,10 +196,3 @@ rtems_device_driver console_control(
 {
   return rtems_termios_ioctl (arg);
 }
-
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-)
-{
-  rtems_termios_reserve_resources( configuration, 1 );
-}

c/src/lib/libbsp/powerpc/psim/include/bsp.h

@@ -36,6 +36,15 @@
 extern "C" {
 #endif
 
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - termios serial ports (defaults to 1)
+ *   - Interrupt stack space is not minimum if defined.
+ */
+
+/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
+#define CONFIGURE_INTERRUPT_STACK_MEMORY  (12 * 1024)
+  
 #ifdef ASM
 /* Definition of where to store registers in alignment handler */
 #define ALIGN_REGS 0x0140

c/src/lib/libbsp/powerpc/psim/startup/bspstart.c

@@ -202,7 +202,7 @@ void bsp_start( void )
 
   Cpu_table.do_zero_of_workspace = FALSE;
 
-  Cpu_table.interrupt_stack_size = (12 * 1024);
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
 
   /*
    *  The monitor likes the exception table to be at 0x0.
@@ -233,12 +233,6 @@ void bsp_start( void )
 
   BSP_Configuration.work_space_start = work_space_start;
 
-  /*
-   *  Account for the console's resources
-   */
-
-  console_reserve_resources( &BSP_Configuration );
-
 #if PSIM_FAST_IDLE
   /*
    * Add 1 extension for fast idle

c/src/lib/libbsp/powerpc/psim/tools/runtest

@@ -168,7 +168,7 @@ do
            tname=`echo $tname | sed 's/-node.*//'`
            TEST_TYPE="mp"
            ;;
-       minimum*|stackchk*|spfatal*)
+       minimum*|stackchk*|spfatal*|termio*)
            continue
            ;;
    esac
@@ -177,8 +177,8 @@ do
    then
        cpus="1 2"
 
-       logfile1=$logdir/${tname}_1
-       logfile2=$logdir/${tname}_2
+       logfile1=$logdir/${tname}_1${variant}
+       logfile2=$logdir/${tname}_2${variant}
        infofile1=$logfile1.info
        infofile2=$logfile2.info