diff options
Diffstat (limited to 'c/src/lib')
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/startup/82378zb.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in | 14 |
3 files changed, 12 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/82378zb.c b/c/src/lib/libbsp/powerpc/score603e/startup/82378zb.c index f3b1b314e2..908ed5d25c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/82378zb.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/82378zb.c @@ -10,7 +10,9 @@ * * $Id: */ + #include <bsp.h> +#if (SCORE603E_GENERATION == 1) #include <rtems/libio.h> #include <libcsupport.h> @@ -156,3 +158,4 @@ void set_irq_mask( { assert (0); } +#endif /* end of generation 1 */ diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c index 0bc3d48429..25a990d0ab 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c @@ -10,7 +10,9 @@ * * $Id: */ + #include <bsp.h> +#if (SCORE603E_GENERATION == 2) #include <rtems/libio.h> #include <libcsupport.h> @@ -165,14 +167,5 @@ rtems_unsigned16 read_and_clear_irq() return irq; } - - - - - - - - - - +#endif /* end of generation 2 */ diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in index cfea59e73d..94664ede79 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in @@ -16,6 +16,12 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c +# +# First and second generation use different Bridge chips :( +# Generation 1 --> 82378zb +# Generation 2 --> FPGA +STARTUP_C_PIECES = 82378zb FPGA + C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \ Hwr_init spurious genpvec $(STARTUP_C_PIECES) gnatinstallhandler C_FILES = $(C_PIECES:%=%.c) @@ -42,14 +48,6 @@ INSTALLDIRS = $(PROJECT_RELEASE)/lib $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) -# First and second generation use different Bridge chips :( -# C source names, if any, go here -- minus the .c -# generation 1 -STARTUP_C_PIECES_1_V = 82378zb -# generation 2 -STARTUP_C_PIECES_2_V = FPGA -STARTUP_C_PIECES_ = $(STARTUP_C_PIECES_$(SCORE603E_GENERATION)_V) - # # (OPTIONAL) Add local stuff here using += # |