From 5a09781f021e57d83bab805b789191f4f9f557a2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:49:28 +0000 Subject: 2000-09-04 Ralf Corsepius * clock/Makefile.am, console/Makefile.am, consolex/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, wrapup/Makefile.am, network/Makefile.am: Include compile.am --- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 7 ++++ c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/console/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/include/mvme16x_hw.h | 48 +++++++++++++++------- c/src/lib/libbsp/m68k/mvme162/network/Makefile.am | 8 ++-- c/src/lib/libbsp/m68k/mvme162/start/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am | 1 + c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am | 1 + c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h | 48 +++++++++++++++------- 12 files changed, 88 insertions(+), 31 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 3e6cb00a5b..b266de6288 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,10 @@ +2000-09-04 Ralf Corsepius + + * clock/Makefile.am, console/Makefile.am, consolex/Makefile.am, + start/Makefile.am, startup/Makefile.am, timer/Makefile.am, + tod/Makefile.am, wrapup/Makefile.am, network/Makefile.am: Include + compile.am + 2000-08-25 Charles-Antoine Gauthier * include/mvme16x_hw.h: Added NVRAM_CONFIGURE macro in diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am index 3e08045c00..bb7f99ff8d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am index d4e5619fac..26f76d08b9 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am index b554eac753..6f7f23b0fa 100644 --- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am @@ -14,6 +14,7 @@ H_FILES = consolex.h OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/include/mvme16x_hw.h b/c/src/lib/libbsp/m68k/mvme162/include/mvme16x_hw.h index e57008e10f..109b27211f 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/mvme16x_hw.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/mvme16x_hw.h @@ -204,36 +204,56 @@ typedef volatile struct { * Representation of 82596CA LAN controller: Memory Map */ typedef volatile struct i82596_regs_ { - unsigned short port_lower; /* 0xFFF46000 */ - unsigned short port_upper; /* 0xFFF46002 */ - unsigned long chan_attn; /* 0xFFF46004 */ + unsigned short port_lower; /* 0xFFF46000 */ + unsigned short port_upper; /* 0xFFF46002 */ + unsigned long chan_attn; /* 0xFFF46004 */ } i82596_regs; /* * Base address of the 82596. */ + #define i82596 ((i82596_regs * const) 0xFFF46000) /* * Representation of initialization data in NVRAM */ + +#if defined(mvme167) typedef volatile struct nvram_config_ { - unsigned char dcache_enable; /* 0xFFFC0000 */ - unsigned char icache_enable; /* 0xFFFC0001 */ - unsigned short cache_mode; /* 0xFFFC0002 */ - unsigned long ipaddr; /* 0xFFFC0004 */ - unsigned long netmask; /* 0xFFFC0008 */ - unsigned char enaddr[6]; /* 0xFFFC000C */ - unsigned short processor_id; /* 0xFFFC0012 */ - unsigned long rma_start; /* 0xFFFC0014 */ - unsigned long vma_start; /* 0xFFFC0018 */ - unsigned long ramsize; /* 0xFFFC001C */ + unsigned char cache_mode; /* 0xFFFC0000 */ + unsigned char console_mode; /* 0xFFFC0001 */ + unsigned char console_printk_port; /* 0xFFFC0002 */ + unsigned char pad1; /* 0xFFFC0003 */ + unsigned long ipaddr; /* 0xFFFC0004 */ + unsigned long netmask; /* 0xFFFC0008 */ + unsigned char enaddr[6]; /* 0xFFFC000C */ + unsigned short processor_id; /* 0xFFFC0012 */ + unsigned long rma_start; /* 0xFFFC0014 */ + unsigned long vma_start; /* 0xFFFC0018 */ + unsigned long ramsize; /* 0xFFFC001C */ } nvram_config; /* * Pointer to the base of User Area NVRAM */ -#define nvram ((nvram_config * const) 0xFFFC0000) + +#define nvram ((nvram_config * const) 0xFFFC0000) + +#endif + + +/* + * Flag to indicate if J1-4 is on (and parameters should be + * sought in User Area NVRAM) + */ + +#if defined(mvme167) +#define NVRAM_CONFIGURE \ + ( !( ( (unsigned char)(lcsr->vector_base & 0xFF) ) & 0x10 ) ) +#else +#define NVRAM_CONFIGURE 0 +#endif #ifdef __cplusplus diff --git a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am index 002241488f..2c604fc42a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am @@ -1,11 +1,12 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 +VPATH = @srcdir@:$(srcdir):$(srcdir)/../../mvme167/network + PGM = $(ARCH)/network.rel -VPATH=$(srcdir):$(srcdir)/../../mvme167/network C_FILES = network.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -13,6 +14,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am index afb2a158f7..f60f04bbfa 100644 --- a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am @@ -14,6 +14,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am index 998fb2647a..4cabb8006a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am @@ -16,6 +16,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am index c85ca86376..d5dc842507 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am @@ -15,6 +15,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am index dd13da9f5c..425777c87b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am index 9be8778105..01179ef11e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am @@ -19,6 +19,7 @@ OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h index e57008e10f..109b27211f 100644 --- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h +++ b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h @@ -204,36 +204,56 @@ typedef volatile struct { * Representation of 82596CA LAN controller: Memory Map */ typedef volatile struct i82596_regs_ { - unsigned short port_lower; /* 0xFFF46000 */ - unsigned short port_upper; /* 0xFFF46002 */ - unsigned long chan_attn; /* 0xFFF46004 */ + unsigned short port_lower; /* 0xFFF46000 */ + unsigned short port_upper; /* 0xFFF46002 */ + unsigned long chan_attn; /* 0xFFF46004 */ } i82596_regs; /* * Base address of the 82596. */ + #define i82596 ((i82596_regs * const) 0xFFF46000) /* * Representation of initialization data in NVRAM */ + +#if defined(mvme167) typedef volatile struct nvram_config_ { - unsigned char dcache_enable; /* 0xFFFC0000 */ - unsigned char icache_enable; /* 0xFFFC0001 */ - unsigned short cache_mode; /* 0xFFFC0002 */ - unsigned long ipaddr; /* 0xFFFC0004 */ - unsigned long netmask; /* 0xFFFC0008 */ - unsigned char enaddr[6]; /* 0xFFFC000C */ - unsigned short processor_id; /* 0xFFFC0012 */ - unsigned long rma_start; /* 0xFFFC0014 */ - unsigned long vma_start; /* 0xFFFC0018 */ - unsigned long ramsize; /* 0xFFFC001C */ + unsigned char cache_mode; /* 0xFFFC0000 */ + unsigned char console_mode; /* 0xFFFC0001 */ + unsigned char console_printk_port; /* 0xFFFC0002 */ + unsigned char pad1; /* 0xFFFC0003 */ + unsigned long ipaddr; /* 0xFFFC0004 */ + unsigned long netmask; /* 0xFFFC0008 */ + unsigned char enaddr[6]; /* 0xFFFC000C */ + unsigned short processor_id; /* 0xFFFC0012 */ + unsigned long rma_start; /* 0xFFFC0014 */ + unsigned long vma_start; /* 0xFFFC0018 */ + unsigned long ramsize; /* 0xFFFC001C */ } nvram_config; /* * Pointer to the base of User Area NVRAM */ -#define nvram ((nvram_config * const) 0xFFFC0000) + +#define nvram ((nvram_config * const) 0xFFFC0000) + +#endif + + +/* + * Flag to indicate if J1-4 is on (and parameters should be + * sought in User Area NVRAM) + */ + +#if defined(mvme167) +#define NVRAM_CONFIGURE \ + ( !( ( (unsigned char)(lcsr->vector_base & 0xFF) ) & 0x10 ) ) +#else +#define NVRAM_CONFIGURE 0 +#endif #ifdef __cplusplus -- cgit v1.2.3