Changeset d0733bb in rtems


Ignore:
Timestamp:
Jul 31, 2015, 7:55:22 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
f8cf567
Parents:
9e9e61d
git-author:
Sebastian Huber <sebastian.huber@…> (07/31/15 07:55:22)
git-committer:
Sebastian Huber <sebastian.huber@…> (07/31/15 07:58:48)
Message:

bsps/arm: Do not use ARM_ARCH_7A

This would lead to link-time errors in case less specialized compiler
machine options are used, e.g. to run the GCC test suite.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/shared/include/arm-errata.h

    r9e9e61d rd0733bb  
    3131#endif /* __cplusplus */
    3232
    33 #if defined( __ARM_ARCH_7A__ )
    34 static arm_release_id arm_errata_get_processor_release(
    35   void
    36 )
     33static inline arm_release_id arm_errata_get_processor_release(void)
    3734{
    3835  const uint32_t MIDR          = arm_cp15_get_id_code();
    3936  const uint8_t  REVISION      = (MIDR & 0xF00000U) >> 20;
    4037  const uint8_t  PATCH_LEVEL   = (MIDR & 0xFU);
    41  
     38
    4239  return ARM_RELEASE_ID_FROM_NUMBER_AND_PATCH_LEVEL(
    4340    REVISION,
     
    4542  );
    4643}
    47 #endif /* #if defined( __ARM_ARCH_7A__ ) */
    4844
    49 #if defined( __ARM_ARCH_7A__ )
    50 #if ( defined( RTEMS_SMP ) )
    51 static bool arm_errata_is_applicable_processor_errata_764369(
    52   void
    53 )
     45static bool inline arm_errata_is_applicable_processor_errata_764369(void)
    5446{
     47#if defined(RTEMS_SMP)
    5548  const arm_release_id RELEASE       = arm_errata_get_processor_release();
    5649  bool                 is_applicable = false;
    57  
     50
    5851  /* Errata information for Cortex-A9 processors.
    5952   * Information taken from ARMs
     
    6558   * The corresponding link is: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0360f/BABJFIBA.html
    6659   * Please see this document for more information on these erratas */
    67  
     60
    6861  switch( RELEASE ) {
    6962    case ARM_RELEASE_ID_R4_P1:
     
    8376    break;
    8477  }
    85  
     78
    8679  return is_applicable;
     80#else
     81  return false;
     82#endif
    8783}
    88 #else
    89   #define arm_errata_is_applicable_processor_errata_764369() false
    90 #endif /*  ( defined( RTEMS_SMP ) ) */
    91 #endif /* #if defined( __ARM_ARCH_7A__ ) */
    9284
    93 #if defined( __ARM_ARCH_7A__ )
    94 static bool arm_errata_is_applicable_processor_errata_775420(
    95   void
    96 )
     85static inline bool arm_errata_is_applicable_processor_errata_775420(void)
    9786{
    9887  const arm_release_id RELEASE       = arm_errata_get_processor_release();
    9988  bool                 is_applicable = false;
    100  
     89
    10190  /* Errata information for Cortex-A9 processors.
    10291  * Information taken from ARMs
     
    10897  * The corresponding link is: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0360f/BABJFIBA.html
    10998  * Please see this document for more information on these erratas */
    110  
     99
    111100  switch( RELEASE ) {
    112101    case ARM_RELEASE_ID_R2_P10:
     
    121110    break;
    122111  }
    123  
     112
    124113  return is_applicable;
    125114}
    126 #endif /* #if defined( __ARM_ARCH_7A__ ) */
    127115
    128116#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.