summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--aclocal.m44
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console.c16
-rw-r--r--c/src/lib/libbsp/i386/pc386/network/network.c2
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/Makefile.in5
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/start.s2
-rw-r--r--c/src/lib/libbsp/i386/pc386/timer/timer.c15
-rw-r--r--c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in7
-rw-r--r--c/src/lib/libbsp/i386/shared/io/bspIo.h4
-rw-r--r--c/src/lib/libbsp/i386/shared/irq/irq_asm.s4
-rw-r--r--configure74
-rw-r--r--make/custom/pc386.cfg8
11 files changed, 74 insertions, 67 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index ee698ab873..00a89d46b8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -461,8 +461,8 @@ AC_TRY_RUN([
#include <sys/ipc.h>
#include <sys/sem.h>
int main () {
-#if !defined(sun)
- union semun arg;
+#if !defined(sun)
+ union semun arg ;
#else
union semun {
int val;
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index f67072a3c4..e57d077bcd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -40,6 +40,7 @@
#include <rtems/libio.h>
#include <termios.h>
#include <pc386uart.h>
+#include <libcpu/cpuModel.h>
int PC386ConsolePort = PC386_CONSOLE_PORT_CONSOLE;
@@ -61,8 +62,8 @@ static rtems_irq_connect_data console_isr_data = {PC_386_KEYBOARD,
extern rtems_boolean _IBMPC_scankey(char *); /* defined in 'inch.c' */
-extern BSP_polling_getchar_function_type BSP_wait_polled_input();
-extern void _IBMPC_initVideo();
+extern char BSP_wait_polled_input(void);
+extern void _IBMPC_initVideo(void);
void console_reserve_resources(rtems_configuration_table *conf)
{
@@ -169,9 +170,9 @@ console_initialize(rtems_device_major_number major,
{
/* Install keyboard interrupt handler */
- status = pc386_install_rtems_irq_handler(&console_isr_data);
+ status = pc386_install_rtems_irq_handler(&console_isr_data);
- if (!status)
+ if (!status)
{
printk("Error installing keyboard interrupt handler!\n");
rtems_fatal_error_occurred(status);
@@ -481,8 +482,11 @@ conSetAttr(int minor, const struct termios *t)
* BSP initialization
*/
-BSP_output_char_function_type BSP_output_char = (BSP_output_char_function_type) _IBMPC_outch;
-BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input;
+BSP_output_char_function_type BSP_output_char =
+ (BSP_output_char_function_type) _IBMPC_outch;
+
+BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input;
+
void BSP_emergency_output_init()
{
_IBMPC_initVideo();
diff --git a/c/src/lib/libbsp/i386/pc386/network/network.c b/c/src/lib/libbsp/i386/pc386/network/network.c
index 4dd718fb79..2a13c6e514 100644
--- a/c/src/lib/libbsp/i386/pc386/network/network.c
+++ b/c/src/lib/libbsp/i386/pc386/network/network.c
@@ -511,7 +511,7 @@ rtems_ka9q_driver_attach (int argc, char *argv[], void *p)
sscanf(argv[++argIndex], "%x", &(dp->port));
}
else if (strcmp ("bpar", argv[argIndex]) == 0) {
- sscanf(argv[++argIndex], "%x", (unsigned) &(dp->bpar));
+ sscanf(argv[++argIndex], "%x", (unsigned *) &(dp->bpar));
dp->base = (unsigned char *)(dp->bpar);
}
else {
diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.in b/c/src/lib/libbsp/i386/pc386/start/Makefile.in
index 1f4aacfc86..5d0056ecfb 100644
--- a/c/src/lib/libbsp/i386/pc386/start/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.in
@@ -64,7 +64,6 @@ ${ARCH}/start16.o: start16.s
$(AS) $(ASFLAGS) -o $@ $*.i
${ARCH}/start16.bin: ${ARCH}/start16.o
- - $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
+ $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
--oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o
- - $(OBJCOPY) -O binary $(basename $@).obj $@
- cp $(basename $@).o $(basename $@).bin
+ $(OBJCOPY) -O binary $(basename $@).obj $@
diff --git a/c/src/lib/libbsp/i386/pc386/start/start.s b/c/src/lib/libbsp/i386/pc386/start/start.s
index 5ff92f3134..c2427500dc 100644
--- a/c/src/lib/libbsp/i386/pc386/start/start.s
+++ b/c/src/lib/libbsp/i386/pc386/start/start.s
@@ -106,7 +106,7 @@ speakl: jmp speakl # and SPIN!!!
call printk
addl $4, esp
- call debugPollingGetChar
+ /* call debugPollingGetChar */
#endif
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c
index 4fe0fb2cd9..8ae7f7c011 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c
@@ -55,9 +55,8 @@ volatile rtems_unsigned32 Ttimer_val;
/*-------------------------------------------------------------------------+
| External Prototypes
+--------------------------------------------------------------------------*/
-extern void timerisr();
+extern void timerisr(void);
/* timer (int 08h) Interrupt Service Routine (defined in 'timerisr.s') */
-extern int clockIsOn(const rtems_irq_connect_data*);
/*-------------------------------------------------------------------------+
| Pentium optimized timer handling.
@@ -155,7 +154,7 @@ Read_timer(void)
| Arguments: None.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
-void
+static void
timerOff(const rtems_raw_irq_connect_data* used)
{
/*
@@ -169,7 +168,8 @@ timerOff(const rtems_raw_irq_connect_data* used)
} /* Timer_exit */
-void timerOn(const rtems_raw_irq_connect_data* used)
+static void
+timerOn(const rtems_raw_irq_connect_data* used)
{
/* load timer for US_PER_ISR microsecond period */
outport_byte(TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN);
@@ -181,12 +181,17 @@ void timerOn(const rtems_raw_irq_connect_data* used)
pc386_irq_enable_at_i8259s(used->idtIndex - PC386_IRQ_VECTOR_BASE);
}
+static int
+timerIsOn(const rtems_raw_irq_connect_data *used)
+{
+ return pc386_irq_enabled_at_i8259s(used->idtIndex - PC386_IRQ_VECTOR_BASE);}
+
static rtems_raw_irq_connect_data timer_raw_irq_data = {
PC_386_PERIODIC_TIMER + PC386_IRQ_VECTOR_BASE,
timerisr,
timerOn,
timerOff,
- clockIsOn
+ timerIsOn
};
/*-------------------------------------------------------------------------+
diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in
index db155ca01d..93c14df9ed 100644
--- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in
@@ -8,7 +8,11 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-BSP_PIECES=startup clock console timer pc386dev network
+# We only build the Network library if HAS_KA9Q was defined
+NETWORK_yes_V = network
+NETWORK = $(NETWORK_$(HAS_KA9Q)_V)
+
+BSP_PIECES=startup clock console timer pc386dev $(NETWORK)
GENERIC_PIECES=
# bummer; have to use $foreach since % pattern subst rules only replace 1x
@@ -52,3 +56,4 @@ all: ${ARCH} $(SRCS) $(LIB)
+
diff --git a/c/src/lib/libbsp/i386/shared/io/bspIo.h b/c/src/lib/libbsp/i386/shared/io/bspIo.h
index 337d46a699..e9dc6f4bfb 100644
--- a/c/src/lib/libbsp/i386/shared/io/bspIo.h
+++ b/c/src/lib/libbsp/i386/shared/io/bspIo.h
@@ -22,11 +22,11 @@
* functionnality described after the next command.
*/
typedef void (*BSP_output_char_function_type) (char c);
-typedef char (*BSP_polling_getchar_function_type) (char c);
+typedef char (*BSP_polling_getchar_function_type) (void);
extern BSP_output_char_function_type BSP_output_char;
extern BSP_polling_getchar_function_type BSP_poll_char;
-extern void BSP_emergency_output_init();
+extern void BSP_emergency_output_init(void);
/*
* All the function declared as extern after this comment
* are available for each ix86 BSP by compiling and linking
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.s b/c/src/lib/libbsp/i386/shared/irq/irq_asm.s
index 7765a9dd22..747e7ab564 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.s
+++ b/c/src/lib/libbsp/i386/shared/irq/irq_asm.s
@@ -21,13 +21,13 @@
/*PAGE
- * void _new_ISR_Displatch()
+ * void _New_ISR_Displatch()
*
* Entry point from the outermost interrupt service routine exit.
* The current stack is the supervisor mode stack.
*/
- PUBLIC (_new_ISR_Displatch)
+ PUBLIC (_New_ISR_Displatch)
SYM (_New_ISR_Displatch):
call SYM (_Thread_Dispatch) # invoke Dispatcher
diff --git a/configure b/configure
index db08992ac5..0e23719f40 100644
--- a/configure
+++ b/configure
@@ -2743,8 +2743,8 @@ else
#include <sys/ipc.h>
#include <sys/sem.h>
int main () {
-#if !defined(sun)
- union semun arg;
+#if !defined(sun)
+ union semun arg ;
#else
union semun {
int val;
@@ -2762,7 +2762,7 @@ int main () {
}
EOF
-if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
rtems_cv_sysv_sem="yes"
else
@@ -2785,7 +2785,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6
echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6
-echo "configure:2781: checking whether $RTEMS_HOST supports System V shared memory" >&5
+echo "configure:2789: checking whether $RTEMS_HOST supports System V shared memory" >&5
if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2794,7 +2794,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2790 "configure"
+#line 2798 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2810,7 +2810,7 @@ int main () {
}
EOF
-if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
rtems_cv_sysv_shm="yes"
else
@@ -2833,7 +2833,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6
echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6
-echo "configure:2829: checking whether $RTEMS_HOST supports System V messages" >&5
+echo "configure:2837: checking whether $RTEMS_HOST supports System V messages" >&5
if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2842,7 +2842,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2838 "configure"
+#line 2846 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2858,7 +2858,7 @@ int main () {
}
EOF
-if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
rtems_cv_sysv_msg="yes"
else
@@ -2883,7 +2883,7 @@ fi
# find all the Executive Makefiles
echo $ac_n "checking for Makefile.in in c/src/exec/score/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:2879: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
+echo "configure:2887: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
if test -d $srcdir/c/src/exec/score/tools/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2898,7 +2898,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
-echo "configure:2894: checking for Makefile.in in c/src/exec/rtems" >&5
+echo "configure:2902: checking for Makefile.in in c/src/exec/rtems" >&5
if test -d $srcdir/c/src/exec/rtems; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2913,7 +2913,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
-echo "configure:2909: checking for Makefile.in in c/src/exec/sapi" >&5
+echo "configure:2917: checking for Makefile.in in c/src/exec/sapi" >&5
if test -d $srcdir/c/src/exec/sapi; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2930,7 +2930,7 @@ fi
if test "$RTEMS_HAS_POSIX_API" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
-echo "configure:2926: checking for Makefile.in in c/src/exec/posix" >&5
+echo "configure:2934: checking for Makefile.in in c/src/exec/posix" >&5
if test -d $srcdir/c/src/exec/posix; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2952,7 +2952,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
if test -z "$rtems_bsp"; then
echo $ac_n "checking for bsps""... $ac_c" 1>&6
-echo "configure:2948: checking for bsps" >&5
+echo "configure:2956: checking for bsps" >&5
files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
for file in $files; do
case $file in
@@ -3017,7 +3017,7 @@ echo "configure:2948: checking for bsps" >&5
bspdirs="$bspdirs $bspdir"
echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6
-echo "configure:3013: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
+echo "configure:3021: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3032,7 +3032,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:3028: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
+echo "configure:3036: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3055,7 +3055,7 @@ fi
# find all the CPU dependent library Makefiles
echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:3051: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
+echo "configure:3059: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3072,7 +3072,7 @@ fi
if test "$skip_startfiles" != "yes"; then
echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:3068: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
+echo "configure:3076: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
if test -d $srcdir/c/src/lib/start/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3114,7 +3114,7 @@ fi
# If the tests are enabled, then find all the test suite Makefiles
echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
-echo "configure:3110: checking if the test suites are enabled? " >&5
+echo "configure:3118: checking if the test suites are enabled? " >&5
tests_enabled=yes
# Check whether --enable-tests or --disable-tests was given.
if test "${enable_tests+set}" = set; then
@@ -3133,7 +3133,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:3129: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:3137: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
if test -d $srcdir/c/src/tests/tools/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3150,7 +3150,7 @@ fi
if test "$tests_enabled" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:3146: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:3154: checking for Makefile.in in c/src/tests/libtests" >&5
if test -d $srcdir/c/src/tests/libtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3165,7 +3165,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:3161: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:3169: checking for Makefile.in in c/src/tests/sptests" >&5
if test -d $srcdir/c/src/tests/sptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3180,7 +3180,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:3176: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:3184: checking for Makefile.in in c/src/tests/tmtests" >&5
if test -d $srcdir/c/src/tests/tmtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3195,7 +3195,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:3191: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:3199: checking for Makefile.in in c/src/tests/mptests" >&5
if test -d $srcdir/c/src/tests/mptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3211,7 +3211,7 @@ fi
if test "$RTEMS_HAS_POSIX_API" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:3207: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:3215: checking for Makefile.in in c/src/tests/psxtests" >&5
if test -d $srcdir/c/src/tests/psxtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3229,7 +3229,7 @@ fi
# If the HWAPI is enabled, the find the HWAPI Makefiles
echo $ac_n "checking if the HWAPI is enabled? ""... $ac_c" 1>&6
-echo "configure:3225: checking if the HWAPI is enabled? " >&5
+echo "configure:3233: checking if the HWAPI is enabled? " >&5
# Check whether --enable-hwapi or --disable-hwapi was given.
if test "${enable_hwapi+set}" = set; then
enableval="$enable_hwapi"
@@ -3240,7 +3240,7 @@ if test "${enable_hwapi+set}" = set; then
makefiles="$makefiles c/src/lib/libhwapi/Makefile"
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
-echo "configure:3236: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
+echo "configure:3244: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
if test -d $srcdir/c/src/lib/libhwapi/analog; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3255,7 +3255,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:3251: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
+echo "configure:3259: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
if test -d $srcdir/c/src/lib/libhwapi/discrete; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3270,7 +3270,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3266: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
+echo "configure:3274: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
if test -d $srcdir/c/src/lib/libhwapi/drivers; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3285,7 +3285,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3281: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
+echo "configure:3289: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3300,7 +3300,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3296: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
+echo "configure:3304: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
if test -d $srcdir/c/src/lib/libhwapi/serial; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3315,7 +3315,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
-echo "configure:3311: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
+echo "configure:3319: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
if test -d $srcdir/c/src/lib/libhwapi/support; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3330,7 +3330,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3326: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
+echo "configure:3334: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3375,7 +3375,7 @@ fi
# pick up all the Makefiles in required parts of the tree
echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
-echo "configure:3371: checking for Makefile.in in c/build-tools" >&5
+echo "configure:3379: checking for Makefile.in in c/build-tools" >&5
if test -d $srcdir/c/build-tools; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3390,7 +3390,7 @@ fi
echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
-echo "configure:3386: checking for Makefile.in in make" >&5
+echo "configure:3394: checking for Makefile.in in make" >&5
if test -d $srcdir/make; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3405,7 +3405,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:3401: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:3409: checking for Makefile.in in c/src/lib/libmisc" >&5
if test -d $srcdir/c/src/lib/libmisc; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3420,7 +3420,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:3416: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:3424: checking for Makefile.in in c/src/tests/samples" >&5
if test -d $srcdir/c/src/tests/samples; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index ceff0c6656..50689fce06 100644
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -58,10 +58,7 @@ endef
RELOCADDR=0x00100000
START16FILE=$(PROJECT_RELEASE)/lib/start16.bin
-#START16ADDR=0x00097C00
-#HEADERADDR=0x00097E00
-# this may not be right but it accounts for a change in the .s file size.
-START16ADDR=0x00097A00
+START16ADDR=0x00097C00
HEADERADDR=0x00097E00
# The following are definitions of make-exe which will work using ld as
@@ -108,6 +105,3 @@ endef
endif
# Miscellaneous additions go here
-
-
-