Changeset a880c90 in rtems

Timestamp:

05/18/12 13:41:56 (11 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

1901afc5

Parents:

e7cf654

git-author:

Sebastian Huber <sebastian.huber@…> (05/18/12 13:41:56)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/21/12 08:59:59)

Message:

powerpc/mpc55xxevb: Fix cache define usage

File:

• c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S (modified) (4 diffs)

c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -36 +36 @@
         li      r4, 0x4
 
-#ifdef MPC55XX_HAS_INSTRUCTION_CACHE
+#if defined(BSP_INSTRUCTION_CACHE_ENABLED) \
+  && defined(MPC55XX_HAS_INSTRUCTION_CACHE)
 
 start_instruction_cache_invalidation:
@@ -65 +66 @@
         mtspr   FSL_EIS_L1CSR1, r6
 
-#endif /* MPC55XX_HAS_INSTRUCTION_CACHE */
+#endif
 
-#if defined(MPC55XX_HAS_DATA_CACHE) || defined(MPC55XX_HAS_UNIFIED_CACHE)
+#if (defined(BSP_DATA_CACHE_ENABLED) && defined(MPC55XX_HAS_DATA_CACHE)) \
+  || ((defined(BSP_DATA_CACHE_ENABLED) \
+    || defined(BSP_INSTRUCTION_CACHE_ENABLED)) \
+      && defined(MPC55XX_HAS_UNIFIED_CACHE))
 
 start_data_cache_invalidation:
@@ -101 +105 @@
         mtspr   FSL_EIS_L1CSR0, r6
 
-#endif /* defined(MPC55XX_HAS_DATA_CACHE) || defined(MPC55XX_HAS_UNIFIED_CACHE) */
+#endif
 
         /* Return */