diff options
23 files changed, 224 insertions, 461 deletions
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in index e2cc7c6b24..1aa164a880 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in @@ -4,20 +4,22 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/directory.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/directory.cfg SRCS=README +# We only build the ka9q device driver if HAS_KA9Q was defined +KA9Q_DRIVER_yes_V = sonic +KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) + all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories SUB_DIRS=include clock console startup start timer \ - tod sonic wrapup + tod $(KA9Q_DRIVER) wrapup diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in index 4c145d2dfc..7c2cfc0772 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/clock.rel @@ -27,9 +25,8 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg - +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c b/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c index 03059c6cea..dab7f192a3 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c @@ -21,7 +21,6 @@ #include <bsp.h> #include <rtems/libio.h> -#include <assert.h> /* * The Real Time Clock Counter Timer uses this trap type. @@ -56,13 +55,7 @@ void Clock_exit( void ); rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; -#define PPC_Set_decrementer( _clicks ) \ - do { \ - asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ - } while (0) - - -/* PAGE +/*PAGE * * Clock_isr * @@ -101,7 +94,7 @@ rtems_isr Clock_isr( rtems_clock_tick(); } -/* PAGE +/*PAGE * * Install_clock * @@ -133,7 +126,7 @@ void Install_clock( } } -/* PAGE +/*PAGE * * Clock_exit * @@ -158,7 +151,7 @@ void Clock_exit( void ) } } -/* PAGE +/*PAGE * * Clock_initialize * diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in index eb8b914e91..cf4d17a5be 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/console.rel @@ -22,8 +20,8 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/console.c b/c/src/lib/libbsp/powerpc/dmv177/console/console.c index b1fc6f19e9..df38e346b4 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/console.c +++ b/c/src/lib/libbsp/powerpc/dmv177/console/console.c @@ -38,7 +38,7 @@ /* Proto-types for Duart.C */ void console_initialize_interrupts( void ); -char console_inbyte_polled( int port ); +int console_inbyte_nonblocking( int port ); void console_outbyte_polled(int port, char ch); rtems_isr console_isr (rtems_vector_number vector); volatile void init_mc88681(); @@ -201,9 +201,16 @@ rtems_device_driver console_open( { rtems_status_code sc; int port = minor; -#if defined(CONSOLE_USE_INTERRUPTS) - rtems_libio_open_close_args_t *args = arg; -#endif + static const rtems_termios_callbacks pollCallbacks = { + NULL, /* firstOpen */ + NULL, /* lastClose */ + console_inbyte_nonblocking, /* pollRead */ + console_write_support, /* write */ + NULL, /* setAttributes */ + NULL, /* stopRemoteTx */ + NULL, /* startRemoteTx */ + 0 /* outputUsesInterrupts */ + }; /* * Verify the minor number is valid. @@ -217,16 +224,7 @@ rtems_device_driver console_open( /* * open the port as a termios console driver. */ -#if defined(CONSOLE_USE_INTERRUPTS) - sc = rtems_termios_open (major, minor, arg, - NULL, NULL, NULL, - console_write_support, 0); -#else - sc = rtems_termios_open (major, minor, arg, NULL, NULL, - console_inbyte_nonblocking, - console_write_support, - 0); -#endif + sc = rtems_termios_open (major, minor, arg, &pollCallbacks); return sc; } @@ -474,6 +472,3 @@ void console_exit() while (!(*_addr & MC68681_TX_EMPTY)); } #endif /* CONSOLE_USE_INTERRUPTS */ - - - diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/duart.c b/c/src/lib/libbsp/powerpc/dmv177/console/duart.c index f72b37a832..e74ef7c378 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/duart.c +++ b/c/src/lib/libbsp/powerpc/dmv177/console/duart.c @@ -38,7 +38,7 @@ rtems_isr console_isr (rtems_vector_number vector); Ring_buffer_t TX_Buffer[2]; Ring_buffer_t RX_Buffer[2]; -/* PAGE +/*PAGE * * init_mc88681 * @@ -63,7 +63,7 @@ volatile void init_mc88681() Ring_buffer_Initialize( &TX_Buffer[ 1 ] ); } -/* PAGE +/*PAGE * * console_isr * @@ -86,7 +86,7 @@ rtems_isr console_isr (rtems_vector_number vector) } -/* PAGE +/*PAGE * * console_outbyte_polled * @@ -130,9 +130,9 @@ void console_outbyte_polled( } -/* PAGE +/*PAGE * - * console_inbyte_polled + * console_inbyte_nonblocking * * This routine reads a character from the UART. * @@ -148,7 +148,7 @@ void console_outbyte_polled( #define MC68681_RECEIVE_ERRORS \ (MC68681_OVERRUN_ERROR | MC68681_PARITY_ERROR | MC68681_FRAMING_ERROR) -char console_inbyte_polled( int port ) +int console_inbyte_nonblocking( int port ) { char status; char data; diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in index 54f072893c..3bca35e05f 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h \ $(srcdir)/dmv170.h $(srcdir)/chain.h $(srcdir)/tod.h @@ -28,8 +26,8 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h index aa4f4df348..0e91696eac 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h @@ -73,7 +73,6 @@ extern "C" { asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ unsigned32 _clicks = 0xffffffff; \ diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h index 2c0d8a0b00..f7c504f9ed 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h +++ b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h @@ -41,10 +41,16 @@ extern "C" { #endif -/* Note: Move address defs to the linker files. */ -#define DMV170_RTC_ADDRESS 0xf2c00000 /* Real Time clock Base Address*/ -#define DUART_ADDR 0xf2800000 /* base address of the DUART(68681) */ -#define SCC_ADDR 0xfb000000 /* base address for the SCC (85C30) */ +/* Note: Move address defs to the linker files. XXX */ + +/* Real Time Clock Base Address */ +#define DMV170_RTC_ADDRESS (unsigned char *)0xf2c00000 + +/* base address of the DUART(68681) */ +#define DUART_ADDR 0xf2800000 + +/* base address for the SCC (85C30) */ +#define SCC_ADDR 0xfb000000 #define DMV170_LOCAL_CONTROL_STATUS_REG 0xf2400000 #define DMV170_TIMER0_COUNT_INTERVAL_REG 0xf2400008 @@ -53,12 +59,11 @@ extern "C" { #define DMV170_TIMER_CONTROL_REG 0xf2400020 #define DMV170_CARD_RESORCE_REG 0xf2400040 +#define DMV170_WRITE( _reg, _data ) \ + *((volatile rtems_unsigned16 *)(_reg)) = (_data) -#define DMV170_WRITE( reg,data) \ - *((volatile rtems_unsigned16 *)(reg)) = (data) - -#define DMV170_READ( reg, data ) \ - (data) = *((volatile rtems_unsigned16 *)(reg)) +#define DMV170_READ( _reg, _data ) \ + (_data) = *((volatile rtems_unsigned16 *)(_reg)) /* * The following defines the bits in the Local Control and Status Register. @@ -81,8 +86,11 @@ extern "C" { #define DMV170_EEPROM_DATA_HIGH 0x0080 #define DMV170_EEPROM_DATA_LOW 0x0000 -/* Bits 8:10 68040 Transfer Modifer Codes represent the Transfer Modifier to be used on MAXPack Accesses. */ -/* Bit 11 68040 Transfer Type (TT) 0:TT are both low 1:TT are both high */ +/* Bits 8-10: 68040 Transfer Modifer Codes represent the Transfer + * Modifier to be used on MAXPack Accesses. + * + * Bit 11 : 68040 Transfer Type (TT) 0:TT are both low 1:TT are both high + */ #define DMV170_USER_LINK0_STATUS_MASK 0x1000 #define DMV170_USER_LINK0_OPEN 0x1000 @@ -206,10 +214,3 @@ extern "C" { #endif /* !_INCLUDE_DMV170_h */ /* end of include file */ - - - - - - - diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in index dcab232876..20d34c03e5 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/sonic.rel @@ -27,9 +25,8 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg - +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in index 10d2b8a9ea..cb7d9c07ec 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGMS=${ARCH}/start.o @@ -27,8 +25,8 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/start.s b/c/src/lib/libbsp/powerpc/dmv177/start/start.s index 1b471c0d8c..7f1dca00e6 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/start/start.s +++ b/c/src/lib/libbsp/powerpc/dmv177/start/start.s @@ -108,9 +108,9 @@ _start: stwu sp,-56(sp) /* push another stack frame */ /* Let her rip */ - bl FUNC_NAME(main) + bl FUNC_NAME(boot_card) - /* return value from main is argument to exit */ + /* return value from boot_card is argument to exit */ bl FUNC_NAME(exit) trap .Lstart: diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in index 229bfa3eef..0877918685 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in @@ -4,39 +4,29 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +VPATH = @srcdir@:@srcdir@/../../../shared +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspstart sbrk setvec genpvec vmeintr +C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec genpvec vmeintr C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) -CC_PIECES=rtems-ctor -CC_FILES=$(CC_PIECES:%=%.cc) -CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o) - H_FILES= # Assembly source names, if any, go here -- minus the .s -S_PIECES=bspclean +S_PIECES= S_FILES=$(S_PIECES:%=%.s) S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(S_O_FILES) -# We install the RTEMS constructor as a separate .o -# so it can be easily place correctly by the compiler config file. -INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o - -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += @@ -65,4 +55,3 @@ ${PGM}: ${SRCS} ${OBJS} all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM) $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib - $(INSTALL_VARIANT) $(INSTALLED_O_FILES) ${PROJECT_RELEASE}/lib diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c index fba086515c..1cb84d7d6b 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c @@ -20,11 +20,6 @@ #include <libcsupport.h> #include <string.h> -#include <fcntl.h> - -#ifdef STACK_CHECKER_ON -#include <stackchk.h> -#endif /* * The original table from the application and our copy of it with @@ -36,21 +31,22 @@ rtems_configuration_table BSP_Configuration; rtems_cpu_table Cpu_table; rtems_unsigned32 bsp_isr_level; -/* PAGE - * - * bsp_libc_init - * - * Initialize whatever libc we are using called from bsp_postdriver_hook. - * - * Input parameters: NONE +/* + * Use the shared implementations of the following routines + */ + +void bsp_postdriver_hook(void); +void bsp_libc_init( void *, unsigned32, int ); + +/*PAGE * - * Output parameters: NONE + * bsp_pretasking_hook * - * Return values: NONE - * + * BSP pretasking hook. Called just before drivers are initialized. + * Used to setup libc and install any BSP extensions. */ -void bsp_libc_init(void) +void bsp_pretasking_hook(void) { extern int end; rtems_unsigned32 heap_start; @@ -63,55 +59,7 @@ void bsp_libc_init(void) heap_size = BSP_Configuration.work_space_start - (void *)&end; heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ - RTEMS_Malloc_Initialize((void *) heap_start, heap_size, 0); - - /* - * Init the RTEMS libio facility to provide UNIX-like system - * calls for use by newlib (ie: provide __rtems_open, __rtems_close, etc) - * Uses malloc() to get area for the iops, so must be after malloc init - */ - - rtems_libio_init(); - - /* - * Set up for the libc handling. - */ - - if (BSP_Configuration.ticks_per_timeslice > 0) - libc_init(1); /* reentrant if possible */ - else - libc_init(0); /* non-reentrant */ - -} - - -/* PAGE - * - * bsp_pretasking_hook - * - * BSP pretasking hook. Called just before drivers are initialized. - * Used to setup libc and install any BSP extensions. - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * Return values: NONE - * - */ - -void bsp_pretasking_hook(void) -{ - bsp_libc_init(); - -#ifdef STACK_CHECKER_ON - /* - * Initialize the stack bounds checker - * We can either turn it on here or from the app. - */ - - Stack_check_Initialize(); -#endif + bsp_libc_init((void *) heap_start, heap_size, 0); #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); @@ -136,56 +84,11 @@ void bsp_predriver_hook(void) initialize_external_exception_vector(); } -/* PAGE - * - * bsp_postdriver_hook - * - * After drivers are setup, register some "filenames" - * and open stdin, stdout, stderr files - * - * Newlib will automatically associate the files with these - * (it hardcodes the numbers) - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * Return values: NONE - * - */ - -void bsp_postdriver_hook(void) -{ - int stdin_fd, stdout_fd, stderr_fd; - int error_code; - - error_code = 'S' << 24 | 'T' << 16; - - if ((stdin_fd = __rtems_open("/dev/console", O_RDONLY, 0)) == -1) - rtems_fatal_error_occurred( error_code | 'D' << 8 | '0' ); - - if ((stdout_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1) - rtems_fatal_error_occurred( error_code | 'D' << 8 | '1' ); - - if ((stderr_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1) - rtems_fatal_error_occurred( error_code | 'D' << 8 | '2' ); - - if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2)) - rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' ); -} - -/* PAGE +/*PAGE * * bsp_start * * This routine does the bulk of the system initialization. - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * Return values: NONE - * */ void bsp_start( void ) @@ -198,58 +101,15 @@ void bsp_start( void ) * check how the real board comes up. This is critical to * getting the source to work with the debugger. */ + _CPU_MSR_SET( msr_value ); /* - * Set up our hooks - * Make sure libc_init is done before drivers initialized so that - * they can use atexit() - */ - - Cpu_table.exceptions_in_RAM = TRUE; - - Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ - - Cpu_table.predriver_hook = bsp_predriver_hook; - - Cpu_table.postdriver_hook = bsp_postdriver_hook; - - Cpu_table.idle_task = NULL; /* do not override system IDLE task */ - - Cpu_table.clicks_per_usec = 66 / 4; /* XXX get from linkcmds */ - - - /* - * SIS does zero out memory BUT only when IT begins execution. Thus - * if we want to have a clean slate in the workspace each time we - * begin execution of OUR application, then we must zero the workspace. - */ - - Cpu_table.do_zero_of_workspace = TRUE; - - /* - * This should be enough interrupt stack. - */ - - Cpu_table.interrupt_stack_size = (12 * 1024); - - /* - * DMV170 does not support MP configurations so there is really no way - * to check this out. + * Need to "allocate" the memory for the RTEMS Workspace and + * tell the RTEMS configuration where it is. This memory is + * not malloc'ed. It is just "pulled from the air". */ - Cpu_table.extra_mpci_receive_server_stack = 0; - - /* - * Copy the table and allocate memory for the RTEMS Workspace - */ - - BSP_Configuration = Configuration; - -#if defined(RTEMS_POSIX_API) - BSP_Configuration.work_space_size *= 3; -#endif - work_space_start = (unsigned char *)&RAM_END - BSP_Configuration.work_space_size; @@ -261,52 +121,21 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; /* - * Add 1 region for RTEMS Malloc - */ - - BSP_Configuration.RTEMS_api_configuration->maximum_regions++; - - /* * Account for the console's resources */ console_reserve_resources( &BSP_Configuration ); -#ifdef RTEMS_NEWLIB - /* - * Add 1 extension for newlib libc - */ - - BSP_Configuration.maximum_extensions++; -#endif - -#ifdef STACK_CHECKER_ON /* - * Add 1 extension for stack checker + * initialize the CPU table for this BSP */ - BSP_Configuration.maximum_extensions++; -#endif - - /* - * Add 1 extension for MPCI_fatal - */ - - if (BSP_Configuration.User_multiprocessing_table) - BSP_Configuration.maximum_extensions++; - - /* - * Initialize RTEMS. main() will finish it up and start multitasking. - */ + Cpu_table.exceptions_in_RAM = TRUE; + Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ + Cpu_table.predriver_hook = bsp_predriver_hook; + Cpu_table.postdriver_hook = bsp_postdriver_hook; + Cpu_table.clicks_per_usec = 66 / 4; /* XXX get from linkcmds */ - rtems_libio_config( &BSP_Configuration, BSP_LIBIO_MAX_FDS ); - - bsp_isr_level = rtems_initialize_executive_early( - &BSP_Configuration, - &Cpu_table - ); + Cpu_table.do_zero_of_workspace = TRUE; + Cpu_table.interrupt_stack_size = (12 * 1024); } - - - - diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c index 98989c2401..09918845b1 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c @@ -46,8 +46,47 @@ EE_ISR_Type ISR_Nodes [NUM_LIRQ_HANDLERS]; rtems_unsigned16 Nodes_Used; Chain_Control ISR_Array [NUM_LIRQ]; +/*PAGE + * + * external_exception_ISR + * + * This interrupt service routine is called for an External Exception. + * + * Input parameters: + * vector - vector number representing the external exception vector. + * + * Output parameters: NONE + * + * Return values: + */ + +rtems_isr external_exception_ISR ( + rtems_vector_number vector /* IN */ +) +{ + rtems_unsigned16 index; + Chain_Node *node; + EE_ISR_Type *ee_isr; + + /* + * Read vector. + */ + index = 0; -/* PAGE + node = ISR_Array[ index ].first; + while ( !_Chain_Is_tail( &ISR_Array[ index ], node ) ) { + ee_isr = (EE_ISR_Type *) node; + (*ee_isr->handler)( ee_isr->vector ); + node = node->next; + } + + /* + * Clear the interrupt. + */ +} + + +/*PAGE * * initialize_external_exception_vector * @@ -80,7 +119,7 @@ void initialize_external_exception_vector () PPC_IRQ_EXTERNAL , (rtems_isr_entry *) &previous_isr ); } -/* PAGE +/*PAGE * * set_EE_vector * @@ -95,6 +134,7 @@ void initialize_external_exception_vector () * * Return values: */ + rtems_isr_entry set_EE_vector( rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector /* vector number */ @@ -145,40 +185,3 @@ rtems_isr_entry set_EE_vector( return 0; } -/* PAGE - * - * external_exception_ISR - * - * This interrupt service routine is called for an External Exception. - * - * Input parameters: - * vector - vector number representing the external exception vector. - * - * Output parameters: NONE - * - * Return values: - */ - -rtems_isr external_exception_ISR ( - rtems_vector_number vector /* IN */ -) -{ - rtems_unsigned16 index; - EE_ISR_Type *node; - - /* - * Read vector. - */ - index = 0; - - node = ISR_Array[ index ].first; - while ( !_Chain_Is_tail( &ISR_Array[ index ], node ) ) { - (*node->handler)( node->vector ); - node = node->Node.next; - } - - /* - * Clear the interrupt. - */ -} - diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds b/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds index 80b586dbad..9a33355599 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds @@ -50,16 +50,16 @@ SECTIONS *(.descriptors) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - } =0 - .init : { *(.init) } =0 - .fini : { *(.fini) } =0 - .rodata : { *(.rodata) } - .rodata1 : { *(.rodata1) } + } >RAM + .init : { *(.init) } >RAM + .fini : { *(.fini) } >RAM + .rodata : { *(.rodata) } >RAM + .rodata1 : { *(.rodata1) } >RAM _etext = .; PROVIDE (etext = .); PROVIDE (__SDATA2_START__ = .); - .sdata2 : { *(.sdata2) } - .sbss2 : { *(.sbss2) } + .sdata2 : { *(.sdata2) } >RAM + .sbss2 : { *(.sbss2) } >RAM PROVIDE (__SBSS2_END__ = .); /* Adjust the address for the data segment. We want to adjust up to the same address within the page on the next page up. It would @@ -81,44 +81,53 @@ SECTIONS { *(.data) CONSTRUCTORS - } + } >RAM PROVIDE (__EXCEPT_START__ = .); - .gcc_except_table : { *(.gcc_except_table) } + .gcc_except_table : { *(.gcc_except_table) } >RAM PROVIDE (__EXCEPT_END__ = .); - .data1 : { *(.data1) } - .got1 : { *(.got1) } - .dynamic : { *(.dynamic) } + .data1 : { *(.data1) } >RAM + .got1 : { *(.got1) } >RAM + .dynamic : { *(.dynamic) } >RAM /* Put .ctors and .dtors next to the .got2 section, so that the pointers get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ - PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } - PROVIDE (__GOT2_END__ = .); - PROVIDE (__CTOR_LIST__ = .); - .ctors : { *(.ctors) } - PROVIDE (__CTOR_END__ = .); - PROVIDE (__DTOR_LIST__ = .); - .dtors : { *(.dtors) } - PROVIDE (__DTOR_END__ = .); - PROVIDE (_FIXUP_START_ = .); - .fixup : { *(.fixup) } - PROVIDE (_FIXUP_END_ = .); - PROVIDE (__FIXUP_END__ = .); - PROVIDE (_GOT2_END_ = .); - PROVIDE (_GOT_START_ = .); + PROVIDE (_GOT2_START_ = .); + PROVIDE (__GOT2_START__ = .); + .got2 : { *(.got2) } >RAM + PROVIDE (_GOT2_END_ = .); + PROVIDE (__GOT2_END__ = .); + + PROVIDE (__CTOR_LIST__ = .); + .ctors : { *(.ctors) } >RAM + PROVIDE (__CTOR_END__ = .); + + PROVIDE (__DTOR_LIST__ = .); + .dtors : { *(.dtors) } >RAM + PROVIDE (__DTOR_END__ = .); + + PROVIDE (_FIXUP_START_ = .); + PROVIDE (__FIXUP_START__ = .); + .fixup : { *(.fixup) } >RAM + PROVIDE (_FIXUP_END_ = .); + PROVIDE (__FIXUP_END__ = .); + + PROVIDE (_GOT2_END_ = .); + PROVIDE (_GOT_START_ = .); s.got = .; - .got : { *(.got) } - .got.plt : { *(.got.plt) } - PROVIDE (_GOT_END_ = .); - PROVIDE (__GOT_END__ = .); + .got : { *(.got) } >RAM + .got.plt : { *(.got.plt) } >RAM + PROVIDE (_GOT_END_ = .); + PROVIDE (__GOT_END__ = .); + /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ PROVIDE (__SDATA_START__ = .); - .sdata : { *(.sdata) } + .sdata : { *(.sdata) } >RAM _edata = .; PROVIDE (edata = .); + PROVIDE (RAM_END = 4M); .sbss : { @@ -126,7 +135,7 @@ SECTIONS *(.sbss) *(.scommon) PROVIDE (__sbss_end = .); - } + } >RAM PROVIDE (__SBSS_END__ = .); .bss : { @@ -134,7 +143,7 @@ SECTIONS *(.dynbss) *(.bss) *(COMMON) - } + } >RAM . = ALIGN(8) + 0x8000; PROVIDE (__stack = .); _end = . ; diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c index 4fb6333da8..5bb96cf792 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c @@ -12,8 +12,6 @@ * RETURNS: * address of previous interrupt handler * - * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c: - * * COPYRIGHT (c) 1989-1997. * On-Line Applications Research Corporation (OAR). * Copyright assigned to U.S. Government, 1994. @@ -28,23 +26,6 @@ #include <rtems.h> #include <bsp.h> - -/* PAGE - * - * set_vector - * - * This routine installs vector number vector. - * - * Input parameters: - * handler - routine to call when the interupt occurs - * vector - vector id - * type - RAW or RTEMS vector - * - * Output parameters: NONE - * - * Return values: Removed interupt routine or 0 if none. - */ - rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector, /* vector number */ @@ -54,7 +35,6 @@ rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry previous_isr; rtems_status_code status; - /* * vectors greater than PPC603e_IRQ_LAST are handled by the General purpose * interupt handler. @@ -63,8 +43,8 @@ rtems_isr_entry set_vector( /* returns old vector */ set_EE_vector ( handler, vector ); } else { - status = rtems_interrupt_catch - ( handler, vector, (rtems_isr_entry *) &previous_isr ); + status = rtems_interrupt_catch( + handler, vector, (rtems_isr_entry *) &previous_isr ); } return previous_isr; } diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in index 35a903e737..16665e4de9 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/timer.rel @@ -27,8 +25,8 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c b/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c index 72d1bb79a3..fe22682c59 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c @@ -18,26 +18,7 @@ rtems_unsigned64 Timer_driver_Start_time; rtems_boolean Timer_driver_Find_average_overhead; -static inline rtems_unsigned64 PPC_Get_timebase_register( void ) -{ - rtems_unsigned32 tbr_low; - rtems_unsigned32 tbr_high; - rtems_unsigned32 tbr_high_old; - rtems_unsigned64 tbr; - - do { - asm volatile( "mftbu %0" : "=r" (tbr_high_old)); - asm volatile( "mftb %0" : "=r" (tbr_low)); - asm volatile( "mftbu %0" : "=r" (tbr_high)); - } while ( tbr_high_old != tbr_high ); - - tbr = tbr_high; - tbr <<= 32; - tbr |= tbr_low; - return tbr; -} - -/* PAGE +/*PAGE * * Timer_initialize * diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in index dfad6613f4..c32c5be44d 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/tod.rel @@ -22,8 +20,8 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/leaf.cfg # First and second generation use different RTC chips :( TOD_PIECES=tod diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/tod.c b/c/src/lib/libbsp/powerpc/dmv177/tod/tod.c index 800f342cf1..05633a120e 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/tod.c +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/tod.c @@ -25,12 +25,12 @@ void ICM7170_GetTOD( volatile unsigned char *imc1770_regs, - rtems_unsigned8 icm1770_freq, + rtems_unsigned8 icm1770_freq, rtems_time_of_day *rtc_tod ); void ICM7170_SetTOD( volatile unsigned char *imc1770_regs, - rtems_unsigned8 icm1770_freq, + rtems_unsigned8 icm1770_freq, rtems_time_of_day *rtc_tod ); @@ -243,7 +243,6 @@ void ICM7170_SetTOD( rtems_time_of_day *rtc_tod ) { - int ticks; int year; year = rtc_tod->year; @@ -273,10 +272,3 @@ void ICM7170_SetTOD( ICM7170_SetField( imc1770_regs, 0x11, (0x0c | icm1770_freq) ); } - - - - - - - diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in index 285b8e0356..02bee936b5 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in @@ -4,16 +4,21 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg -#BSP_PIECES=startup clock console timer tod vectors -BSP_PIECES=startup clock console sonic timer tod #vectors +# We only build the ka9q device driver if HAS_KA9Q was defined +KA9Q_DRIVER_yes_V = network +KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) + +# pieces specific to this BSP +BSP_PIECES=startup clock console timer tod $(KA9Q_DRIVER) + # pieces to pick up out of libcpu/$(RTEMS_CPU) CPU_PIECES= + +# shared pieces GENERIC_PIECES= # bummer; have to use $foreach since % pattern subst rules only replace 1x @@ -24,8 +29,8 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/lib.cfg +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/lib.cfg # # (OPTIONAL) Add local stuff here using += diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg index c4e8523ac6..5798a04708 100644 --- a/make/custom/dmv177.cfg +++ b/make/custom/dmv177.cfg @@ -8,16 +8,13 @@ # $Id$ # -include $(PROJECT_ROOT)/make/custom/default.cfg +include $(RTEMS_ROOT)/make/custom/default.cfg -RTEMS_CPU=ppc +RTEMS_CPU=powerpc RTEMS_CPU_MODEL=ppc603e # This is the actual bsp directory used during the build process. - -RTEMS_BSP_FAMILY=dmv170 - -RTEMS_BSP=dmv170 +RTEMS_BSP_FAMILY=dmv177 # This section makes the target dependent options file. @@ -28,13 +25,6 @@ RTEMS_BSP=dmv170 # RTEMS_TEST_NO_PAUSE (RTEMS tests) # do not pause between screens of output in the rtems tests # -# STACK_CHECKER_ON (RTEMS support code) -# If defined, stack bounds checking is enabled. -# -# STACK_CHECKER_REPORT_USAGE (RTEMS support code) -# If this and STACK_CHECKER_ON are defined, then a report on stack usage -# per task is printed when the program exits. -# # RTEMS_DEBUG (RTEMS) # If defined, debug checks in RTEMS and support library code are enabled. # @@ -56,20 +46,23 @@ RTEMS_BSP=dmv170 # This defines the assembly language format used in this configuration. # ELF is the only one supported. # - +# PPC_USE_SPRG (RTEMS PowerPC port) +# If defined, then the PowerPC specific code in RTEMS will use some +# of the special purpose registers to slightly optimize interrupt +# response time. The use of these registers can conflict with +# other tools like debuggers. define make-target-options @echo "/* #define NDEBUG 1 */ " >>$@ @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ - @echo "/* #define STACK_CHECKER_ON 1 */" >>$@ - @echo "/* #define STACK_CHECKER_REPORT_USAGE 1 */" >>$@ @echo "/* #define RTEMS_DEBUG 1 */" >>$@ @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define CONSOLE_USE_POLLED ~CONSOLE_USE_INTERRUPTS" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0100" >>$@ @echo "#define PPC_ABI PPC_ABI_EABI" >>$@ @echo "#define PPC_ASM PPC_ASM_ELF" >>$@ + @echo "#define PPC_USE_SPRG 1" >>$@ endef # This contains the compiler options necessary to select the CPU model @@ -82,6 +75,14 @@ CPU_CFLAGS = -mcpu=603 # NOTE: some level of -O may be actually required by inline assembler CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions +# Define this to yes if this target supports multiprocessor environments. +HAS_MP=no + +# XXX temporary +# This target does not support the ka9q tcp/ip stack so ignore requests +# to enable it. +HAS_KA9Q=no + # The following is a linkcmds file which will work without using the # -specs system in gcc 2.8. # $(LD) $(XLDFLAGS) -T $(LINKCMDS) \ @@ -108,5 +109,5 @@ endef # No start file START_BASE= - +# Let the HWAPI know which set of drivers to build DRIVER_ARCHITECTURE=vmebus |