summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2005-10-05 19:25:07 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2005-10-05 19:25:07 +0000
commit73c2d237de7070aa5b256cebc9dab1e1f9ef6a18 (patch)
treea3345dc1f4315dd6e7312cde6a9684af36340cd2 /c
parent2005-10-05 Jiri Gaisler <jiri@gaisler.com> (diff)
downloadrtems-73c2d237de7070aa5b256cebc9dab1e1f9ef6a18.tar.bz2
2005-10-05 Jiri Gaisler <jiri@gaisler.com>
Edvin Catovic <edvin@gaisler.com> Konrad Eisele <konrad@gaisler.com> PR 827/bsps * ChangeLog, configure.ac, console/Makefile.am, console/console.c, console/debugputs.c, startup/Makefile.am, startup/linkcmds, tools/Makefile.am: Portion of large update of SPARC BSPs. Includes addition of sis, leon2 and leon3 BSPs, deletion of leon BSP, addition of SMC91111 NIC driver and much more.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/sparc/erc32/ChangeLog29
-rw-r--r--c/src/lib/libbsp/sparc/erc32/configure.ac7
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/Makefile.am2
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/console.c21
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/debugputs.c1
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/linkcmds18
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/Makefile.am7
8 files changed, 73 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index 0d7aa36ac8..b224ab4a99 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,32 @@
+2005-10-05 Jiri Gaisler <jiri@gaisler.com>
+ Edvin Catovic <edvin@gaisler.com>
+ Konrad Eisele <konrad@gaisler.com>
+
+ PR 827/bsps
+ * ChangeLog, configure.ac, console/Makefile.am, console/console.c,
+ console/debugputs.c, startup/Makefile.am, startup/linkcmds,
+ tools/Makefile.am: Portion of large update of SPARC BSPs. Includes
+ addition of sis, leon2 and leon3 BSPs, deletion of leon BSP, addition
+ of SMC91111 NIC driver and much more.
+
+
+2005-01-20 Jiri Gaisler <jiri@gaisler.com>
+
+ Added support for printk in console/console.c
+
+2004-11-17 Edvin Catovic <edvin@gaisler.com>
+
+ Removed obsolete startup/boardinit.S
+
+
+2004-06-16 Edvin Catovic <edvin@gaisler.com>
+
+ * Makefile.am: Added bspstart (moved here from ../shared)
+ * configure.ac: Added bspstart/Makefile
+ * bspstart/bspstart.c: Moved here from ../shared
+ * bspstart/Makefile.am: New file
+ * wrapup/Makefile.am: Included bspstart in BSP_PIECES
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* clock/ckinit.c, console/console.c, console/consolereserveresources.c,
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac
index 584cef706e..e1269eb643 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.ac
+++ b/c/src/lib/libbsp/sparc/erc32/configure.ac
@@ -36,6 +36,13 @@ RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE],
time spent in the idle task is minimized. This significantly reduces
the wall time required to execute the RTEMS test suites.])
+RTEMS_BSPOPTS_SET([ENABLE_SIS_QUIRKS],[sis],[1])
+RTEMS_BSPOPTS_SET([ENABLE_SIS_QUIRKS],[*],[0])
+RTEMS_BSPOPTS_HELP([ENABLE_SIS_QUIRKS],
+[If defined, then the SIS simulator specific code in the
+ BSP will be enabled. In particular, SIS requires special
+ initialization not used on real ERC32 hardware.])
+
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
diff --git a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
index 0d5e07e99e..7d9d2f8b86 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
@@ -5,7 +5,7 @@
PGM = $(ARCH)/console.rel
-C_FILES = console.c consolereserveresources.c debugputs.c
+C_FILES = console.c debugputs.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)
diff --git a/c/src/lib/libbsp/sparc/erc32/console/console.c b/c/src/lib/libbsp/sparc/erc32/console/console.c
index 78c147a6dd..8672d4ad88 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/console.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/console.c
@@ -17,6 +17,7 @@
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
+#include <rtems/bspIo.h>
/*
* Should we use a polled or interrupt drived console?
@@ -417,3 +418,23 @@ rtems_device_driver console_control(
return rtems_termios_ioctl (arg);
}
+/* putchar/getchar for printk */
+
+static void bsp_out_char (char c)
+{
+ console_outbyte_polled(0, c);
+}
+
+BSP_output_char_function_type BSP_output_char = bsp_out_char;
+
+static char bsp_in_char(void)
+{
+ int tmp;
+
+ while ((tmp = console_inbyte_nonblocking(0)) < 0);
+ return (char) tmp;
+}
+
+BSP_polling_getchar_function_type BSP_poll_char = bsp_in_char;
+
+
diff --git a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
index 796b55caa4..ca6f400f76 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
@@ -17,6 +17,7 @@
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
+#include <stdarg.h>
/*
* console_outbyte_polled
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
index a94cbb6064..887413c23f 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
@@ -11,7 +11,7 @@ C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c main.c bootcard.c sbrk.c \
setvec.c spurious.c erc32mec.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-S_FILES = boardinit.S
+S_FILES =
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES) $(S_O_FILES)
@@ -40,6 +40,6 @@ all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
-EXTRA_DIST = linkcmds setvec.c spurious.c boardinit.S
+EXTRA_DIST = linkcmds setvec.c spurious.c
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
index 95543e6142..4e4cf03cac 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
+++ b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
@@ -138,15 +138,6 @@ SECTIONS
. = ALIGN (16);
_endtext = .;
} > ram
- .dynamic : { *(.dynamic) } >ram
- .jcr : { *(.jcr) } >ram
- .got : { *(.got) } >ram
- .plt : { *(.plt) } >ram
- .hash : { *(.hash) } >ram
- .dynrel : { *(.dynrel) } >ram
- .dynsym : { *(.dynsym) } >ram
- .dynstr : { *(.dynstr) } >ram
- .hash : { *(.hash) } >ram
.data :
{
data_start = .;
@@ -159,6 +150,15 @@ SECTIONS
edata = .;
_edata = .;
} > ram
+ .dynamic : { *(.dynamic) } >ram
+ .jcr : { *(.jcr) } >ram
+ .got : { *(.got) } >ram
+ .plt : { *(.plt) } >ram
+ .hash : { *(.hash) } >ram
+ .dynrel : { *(.dynrel) } >ram
+ .dynsym : { *(.dynsym) } >ram
+ .dynstr : { *(.dynstr) } >ram
+ .hash : { *(.hash) } >ram
.shbss :
{
*(.shbss)
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
index 0e15416cb8..b2a9b8ba83 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
@@ -8,13 +8,12 @@ transform =
bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests
bsptools_bin_SCRIPTS = runtest
-TMPINSTALL_FILES = $(PROJECT_ROOT)/erc32/tests \
- $(PROJECT_ROOT)/erc32/tests/runtest
+TMPINSTALL_FILES = $(bsptools_bindir) $(bsptools_bindir)/runtest
-$(PROJECT_ROOT)/erc32/tests:
+$(bsptools_bindir):
$(mkinstalldirs) $@
-$(PROJECT_ROOT)/erc32/tests/runtest: runtest
+$(bsptools_bindir)/runtest: runtest
$(INSTALL_SCRIPT) $< $@
all-local: $(TMPINSTALL_FILES)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 09:55:06 +0000