Changeset 350127a2 in rtems


Ignore:
Timestamp:
Apr 3, 2012, 3:12:49 PM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
92a3586
Parents:
98244bf4 (diff), eb6362dc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Location:
c/src/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c

    r98244bf4 r350127a2  
    88
    99/*
    10  * Copyright (c) 2009-2011 embedded brains GmbH.  All rights reserved.
     10 * Copyright (c) 2009-2012 embedded brains GmbH.  All rights reserved.
    1111 *
    1212 *  embedded brains GmbH
     
    2525#include <rtems.h>
    2626
    27 #ifdef RTEMS_NETWORKING
     27#include <mpc55xx/regs.h>
     28
     29#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU)
    2830
    2931#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
    3032#define __BSD_VISIBLE 1
    31 
    32 #include <mpc55xx/regs.h>
    3333
    3434#include <errno.h>
     
    19141914}
    19151915
    1916 #endif /* RTEMS_NETWORKING */
     1916#endif /* defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU) */
  • c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h

    r98244bf4 r350127a2  
    99
    1010/*
    11  * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
     11 * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
    1212 *
    1313 *  embedded brains GmbH
     
    3535  #define MPC55XX_HAS_EMIOS
    3636  #define MPC55XX_HAS_FMPLL_ENHANCED
     37  #define MPC55XX_HAS_SIU
    3738#elif MPC55XX_CHIP_TYPE / 10 == 555
    3839  #include <mpc55xx/fsl-mpc555x.h>
     
    4243  #define MPC55XX_HAS_FMPLL
    4344  #define MPC55XX_HAS_UNIFIED_CACHE
     45  #define MPC55XX_HAS_SIU
    4446#elif MPC55XX_CHIP_TYPE / 10 == 556
    4547  #include <mpc55xx/fsl-mpc556x.h>
     
    4951  #define MPC55XX_HAS_FMPLL
    5052  #define MPC55XX_HAS_UNIFIED_CACHE
     53  #define MPC55XX_HAS_SIU
    5154#elif MPC55XX_CHIP_TYPE / 10 == 564
    5255  #include <mpc55xx/fsl-mpc564xL.h>
     
    5760  #define MPC55XX_HAS_LINFLEX
    5861  #define MPC55XX_HAS_SECOND_INTERNAL_RAM_AREA
     62  #define MPC55XX_HAS_SIU_LITE
    5963#elif MPC55XX_CHIP_TYPE / 10 == 567
    6064  #include <mpc55xx/fsl-mpc567x.h>
     
    6569  #define MPC55XX_HAS_INSTRUCTION_CACHE
    6670  #define MPC55XX_HAS_DATA_CACHE
     71  #define MPC55XX_HAS_SIU
    6772#else
    6873  #error "unsupported chip type"
Note: See TracChangeset for help on using the changeset viewer.