Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automake II patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

Browse Source 
With my most recent automake patch (automake II) we could even simplify more
  files below make/, because the host-compiler related parts of those files
  aren't used anymore :-.

  Whatsoever, the patch below should fix this problem.

  Note: This is a mere bug fix, it doesn't move any of the variables involved
  to target.cfg nor does it try to eliminate any variable.
This commit is contained in:
Joel Sherrill
1999-03-24 22:49:17 +00:00
parent 367cc5ef05
commit c9b07e92d1
10 changed files with 101 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
aclocal.m4 vendored
View File

@@ -1,14 +1,4 @@
dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
dnl aclocal.m4 generated automatically by aclocal 1.2
dnl $Id$

2
c/src/exec/Makefile.in
View File

@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
POSIX_DIRS_yes_V=posix
POSIX_DIRS = $(POSIX_DIRS_$(RTEMS_HAS_POSIX_API)_V)
POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)
SUB_DIRS=score rtems $(POSIX_DIRS) sapi wrapup

4
c/src/exec/score/include/rtems/score/Makefile.in
View File

@@ -85,10 +85,10 @@ ifeq (${RTEMS_USE_MACROS},yes)
else
@echo "#define USE_INLINES 1" >>$@
endif
ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
ifeq ($(HAS_MULTIPROCESSING),yes)
@echo "#define RTEMS_MULTIPROCESSING 1" >>$@
endif
ifeq ($(RTEMS_HAS_POSIX_API),yes)
ifeq ($(HAS_POSIX_API),yes)
@echo "#define RTEMS_POSIX_API 1" >>$@
endif
ifeq ($(RTEMS_USE_NEWLIB),yes)

2
c/src/exec/wrapup/Makefile.in
View File

@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
POSIX_DIRS_yes_V=posix
POSIX_DIRS = $(POSIX_DIRS_$(RTEMS_HAS_POSIX_API)_V)
POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)
SUB_DIRS=rtems $(POSIX_DIRS)

2
c/src/lib/libbsp/unix/posix/startup/Makefile.in
View File

@@ -38,7 +38,7 @@ OBJS=$(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
ifeq ($(HAS_CPLUSPLUS),yes)
NO_CTOR_LIB=${ARCH}/libno-ctor.a
INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o
CXX_MAIN=rtems-ctor

47
c/src/lib/libchip/network/sonic.h
View File

@@ -28,6 +28,44 @@
#ifndef _SONIC_DP83932_
#define _SONIC_DP83932_
/*
* Debug levels
*
*/
#define SONIC_DEBUG_NONE 0x0000
#define SONIC_DEBUG_ALL 0xFFFF
#define SONIC_DEBUG_PRINT_REGISTERS 0x0001
#define SONIC_DEBUG_MEMORY 0x0002
#define SONIC_DEBUG_MEMORY_ALLOCATE 0x0004
#define SONIC_DEBUG_MEMORY_DESCRIPTORS 0x0008
#define SONIC_DEBUG_FRAGMENTS 0x0008
#define SONIC_DEBUG_CAM 0x0010
#define SONIC_DEBUG_DESCRIPTORS 0x0020
#define SONIC_DEBUG_ERRORS 0x0040
#define SONIC_DEBUG_DUMP_TX_MBUFS 0x0080
#define SONIC_DEBUG_DUMP_RX_MBUFS 0x0100
#define SONIC_DEBUG_DUMP_MBUFS \
(SONIC_DEBUG_DUMP_TX_MBUFS|SONIC_DEBUG_DUMP_RX_MBUFS)
#define SONIC_DEBUG (SONIC_DEBUG_NONE)
/*
#define SONIC_DEBUG (SONIC_DEBUG_ERRORS | SONIC_DEBUG_PRINT_REGISTERS |\
SONIC_DEBUG_DESCRIPTORS)
*/
/*
((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_PRINT_REGISTERS|SONIC_DEBUG_DUMP_MBUFS))
((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_DUMP_MBUFS))
*/
#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
extern char SONIC_Reg_name[64][6];
#endif
/*
* Configuration Information
*/
@@ -234,16 +272,19 @@ typedef struct {
#define DCR2_EXPO2 0x4000
#define DCR2_EXPO1 0x2000
#define DCR2_EXPO0 0x1000
#define DCR2_HBDIS 0x0800
#define DCR2_PH 0x0010
#define DCR2_PCM 0x0004
#define DCR2_PCNM 0x0002
#define DCR2_RJCM 0x0001
/*
* Known values for the Silicon Revision Register
* Known values for the Silicon Revision Register.
* Note that DP83934 has revision 5 and seems to work.
*/
#define SONIC_REVISION_B 4
#define SONIC_REVISION_DP83934 5
#define SONIC_REVISION_C 6
/*
@@ -413,4 +454,8 @@ int rtems_sonic_driver_attach (
sonic_configuration_t *chip
);
#ifdef CPU_U32_FIX
void ipalign(struct mbuf *m);
#endif
#endif /* _SONIC_DP83932_ */

47
c/src/libchip/network/sonic.h
View File

@@ -28,6 +28,44 @@
#ifndef _SONIC_DP83932_
#define _SONIC_DP83932_
/*
* Debug levels
*
*/
#define SONIC_DEBUG_NONE 0x0000
#define SONIC_DEBUG_ALL 0xFFFF
#define SONIC_DEBUG_PRINT_REGISTERS 0x0001
#define SONIC_DEBUG_MEMORY 0x0002
#define SONIC_DEBUG_MEMORY_ALLOCATE 0x0004
#define SONIC_DEBUG_MEMORY_DESCRIPTORS 0x0008
#define SONIC_DEBUG_FRAGMENTS 0x0008
#define SONIC_DEBUG_CAM 0x0010
#define SONIC_DEBUG_DESCRIPTORS 0x0020
#define SONIC_DEBUG_ERRORS 0x0040
#define SONIC_DEBUG_DUMP_TX_MBUFS 0x0080
#define SONIC_DEBUG_DUMP_RX_MBUFS 0x0100
#define SONIC_DEBUG_DUMP_MBUFS \
(SONIC_DEBUG_DUMP_TX_MBUFS|SONIC_DEBUG_DUMP_RX_MBUFS)
#define SONIC_DEBUG (SONIC_DEBUG_NONE)
/*
#define SONIC_DEBUG (SONIC_DEBUG_ERRORS | SONIC_DEBUG_PRINT_REGISTERS |\
SONIC_DEBUG_DESCRIPTORS)
*/
/*
((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_PRINT_REGISTERS|SONIC_DEBUG_DUMP_MBUFS))
((SONIC_DEBUG_ALL) & ~(SONIC_DEBUG_DUMP_MBUFS))
*/
#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
extern char SONIC_Reg_name[64][6];
#endif
/*
* Configuration Information
*/
@@ -234,16 +272,19 @@ typedef struct {
#define DCR2_EXPO2 0x4000
#define DCR2_EXPO1 0x2000
#define DCR2_EXPO0 0x1000
#define DCR2_HBDIS 0x0800
#define DCR2_PH 0x0010
#define DCR2_PCM 0x0004
#define DCR2_PCNM 0x0002
#define DCR2_RJCM 0x0001
/*
* Known values for the Silicon Revision Register
* Known values for the Silicon Revision Register.
* Note that DP83934 has revision 5 and seems to work.
*/
#define SONIC_REVISION_B 4
#define SONIC_REVISION_DP83934 5
#define SONIC_REVISION_C 6
/*
@@ -413,4 +454,8 @@ int rtems_sonic_driver_attach (
sonic_configuration_t *chip
);
#ifdef CPU_U32_FIX
void ipalign(struct mbuf *m);
#endif
#endif /* _SONIC_DP83932_ */

1
configure.in
View File

@@ -362,6 +362,7 @@ AC_SUBST(RTEMS_HOST)
AC_SUBST(RTEMS_LIBC_DIR)
AC_SUBST(RTEMS_USE_OWN_PDIR)
AC_SUBST(RTEMS_HAS_POSIX_API)
AC_SUBST(RTEMS_HAS_MULTIPROCESSING)
AC_SUBST(RTEMS_HAS_NETWORKING)
AC_SUBST(RTEMS_HAS_RDBG)
AC_SUBST(RTEMS_USE_MACROS)

2
make/custom/gensh1.cfg
View File

@@ -80,4 +80,4 @@ endif
# Miscellaneous additions go here
SHGEN=$(PROJECT_ROOT)/c/src/exec/score/tools/sh/$(ARCH)/shgen
SHGEN=$(PROJECT_ROOT)/c/src/exec/score/tools/sh/shgen

3
make/target.cfg.in
View File

@@ -41,7 +41,6 @@ RTEMS_HOST = @RTEMS_HOST@
RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@
RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
RTEMS_HAS_POSIX_1H_API = @RTEMS_HAS_POSIX_1H_API@
RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
@@ -54,7 +53,7 @@ RTEMS_CPU = @target_cpu@
BARE_CPU_MODEL = @BARE_CPU_MODEL@
BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
# INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
XCFLAGS=$(CFLAGS_FOR_TARGET)
export RTEMS_BSP