summaryrefslogtreecommitdiff
path: root/cesar/hal/arch/inc/sparc.h
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-11-02 08:01:13 +0100
committerNélio Laranjeiro2012-11-29 17:32:09 +0100
commit15f05092aa698a166cfdc6a6d433ea17ea6e082b (patch)
treef934b31a116dc35600a363f50cfe3adc5d1104b1 /cesar/hal/arch/inc/sparc.h
parent230a0a43df5a2c2616f0225247b12b12680612bc (diff)
cesar/hal/arch: add two levels for ilram, closes #3457
Diffstat (limited to 'cesar/hal/arch/inc/sparc.h')
-rw-r--r--cesar/hal/arch/inc/sparc.h54
1 files changed, 22 insertions, 32 deletions
diff --git a/cesar/hal/arch/inc/sparc.h b/cesar/hal/arch/inc/sparc.h
index ab3e75a47c..6050430c2a 100644
--- a/cesar/hal/arch/inc/sparc.h
+++ b/cesar/hal/arch/inc/sparc.h
@@ -19,7 +19,6 @@
#if defined (ECOS) && ECOS
# include "config/arch/ilram.h"
-# include "config/arch/ilram2.h"
# undef ARCH_ILRAM
# define ARCH_ILRAM __attribute__ ((section (".ilram")))
@@ -30,49 +29,40 @@
# undef ARCH_ILRAM_PRIO
# define ARCH_ILRAM_PRIO(prio) PASTE (ARCH_ILRAM_PRIO_, prio)
-# undef ARCH_ILRAM2_PRIO
-# define ARCH_ILRAM2_PRIO(prio) PASTE (ARCH_ILRAM2_PRIO_, prio)
-
-# if CONFIG_ARCH_ILRAM_PRIO >= 3
+# if CONFIG_ARCH_ILRAM_PRIO_LOW >= 4
+# define ARCH_ILRAM_PRIO_4 ARCH_ILRAM
+# elif CONFIG_ARCH_ILRAM_PRIO_HIGH >= 4
+# define ARCH_ILRAM_PRIO_4 ARCH_ILRAM2
+# else
+# define ARCH_ILRAM_PRIO_4
+# endif
+# if CONFIG_ARCH_ILRAM_PRIO_LOW >= 3
# define ARCH_ILRAM_PRIO_3 ARCH_ILRAM
+# elif CONFIG_ARCH_ILRAM_PRIO_HIGH >= 3
+# define ARCH_ILRAM_PRIO_3 ARCH_ILRAM2
# else
-# define ARCH_ILRAM_PRIO_3 ARCH_ILRAM2_PRIO_3
+# define ARCH_ILRAM_PRIO_3
# endif
-# if CONFIG_ARCH_ILRAM_PRIO >= 2
+# if CONFIG_ARCH_ILRAM_PRIO_LOW >= 2
# define ARCH_ILRAM_PRIO_2 ARCH_ILRAM
+# elif CONFIG_ARCH_ILRAM_PRIO_HIGH >= 2
+# define ARCH_ILRAM_PRIO_2 ARCH_ILRAM2
# else
-# define ARCH_ILRAM_PRIO_2 ARCH_ILRAM2_PRIO_2
+# define ARCH_ILRAM_PRIO_2
# endif
-# if CONFIG_ARCH_ILRAM_PRIO >= 1
+# if CONFIG_ARCH_ILRAM_PRIO_LOW >= 1
# define ARCH_ILRAM_PRIO_1 ARCH_ILRAM
+# elif CONFIG_ARCH_ILRAM_PRIO_HIGH >= 1
+# define ARCH_ILRAM_PRIO_1 ARCH_ILRAM2
# else
-# define ARCH_ILRAM_PRIO_1 ARCH_ILRAM2_PRIO_1
+# define ARCH_ILRAM_PRIO_1
# endif
-# if CONFIG_ARCH_ILRAM_PRIO >= 0
+# if CONFIG_ARCH_ILRAM_PRIO_LOW >= 0
# define ARCH_ILRAM_PRIO_0 ARCH_ILRAM
-# else
+# elif CONFIG_ARCH_ILRAM_PRIO_HIGH >= 0
# define ARCH_ILRAM_PRIO_0 ARCH_ILRAM2
-# endif
-
-# if CONFIG_ARCH_ILRAM2_PRIO > 3
-# define ARCH_ILRAM2_PRIO_3 ARCH_ILRAM2
-# else
-# define ARCH_ILRAM2_PRIO_3
-# endif
-# if CONFIG_ARCH_ILRAM2_PRIO > 2
-# define ARCH_ILRAM2_PRIO_2 ARCH_ILRAM2
-# else
-# define ARCH_ILRAM2_PRIO_2
-# endif
-# if CONFIG_ARCH_ILRAM2_PRIO > 1
-# define ARCH_ILRAM2_PRIO_1 ARCH_ILRAM2
-# else
-# define ARCH_ILRAM2_PRIO_1
-# endif
-# if CONFIG_ARCH_ILRAM2_PRIO > 0
-# define ARCH_ILRAM2_PRIO_0 ARCH_ILRAM2
# else
-# define ARCH_ILRAM2_PRIO_0
+# define ARCH_ILRAM_PRIO_0
# endif
# undef ARCH_DLRAM_DATA