2007-11-30 Till Straumann <strauman@slac.stanford.edu>

	* irq/irq.h, irq/irq_init.c: Removed the definition
	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
	initialize the irqBase member of the rtems_irq_global_settings
	struct. However, irqBase is an rtems_irq_symbolic_name,
	so using BSP_LOWEST_OFFSET is more appropriate.

24 files changed, 85 insertions, 47 deletions

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index b741148c68..31c19cea1a 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* shared/irq/irq.h, shared/irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* shared/startup/bspstart.c: Eliminate PowerPC specific elements from
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index dea4e5ced8..5ff09b0bb7 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c
index b4647bec1d..95a516b724 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c
@@ -294,7 +294,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     initial_config.irqNb 	= BSP_IRQ_NUMBER;
     initial_config.defaultEntry = defaultIrq;
     initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase	= BSP_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqBase	= BSP_LOWEST_OFFSET;
     initial_config.irqPrioTbl	= irqPrioTable;
 
     if (!BSP_rtems_irq_mngt_set(&initial_config)) {
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index 0d29d9b386..bace7cdc26 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* clock/clock.c, startup/bspstart.c: Eliminate PowerPC specific
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.h b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.h
index e7c04c5994..f04241d1c2 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.h
@@ -99,15 +99,10 @@
 #define PSE_SOURCE(_source)	(((_source) >> 24) & 0x0000001F)
 
 /*
- * Base index for the module specific irq handlers
- */
-#define BSP_ASM_IRQ_VECTOR_BASE 	0
-#define BSP_PER_VECTOR_BASE		BSP_ASM_IRQ_VECTOR_BASE /* 0 */
-/*
  * Peripheral IRQ handlers related definitions
  */
 #define BSP_PER_IRQ_NUMBER		22
-#define BSP_PER_IRQ_LOWEST_OFFSET	BSP_PER_VECTOR_BASE  /* 0 */
+#define BSP_PER_IRQ_LOWEST_OFFSET	0
 #define BSP_PER_IRQ_MAX_OFFSET		\
 	(BSP_PER_IRQ_LOWEST_OFFSET + BSP_PER_IRQ_NUMBER - 1) /* 21 */
 /*
@@ -288,7 +283,7 @@ typedef struct {
    */
   rtems_irq_connect_data*	irqHdlTbl;
   /*
-   * actual value of BSP_PER_IRQ_VECTOR_BASE...
+   * actual value of BSP_PER_IRQ_LOWEST_OFFSET...
    */
   rtems_irq_symbolic_name	irqBase;
   /*
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
index 643022b4a7..ba2abda338 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
@@ -250,7 +250,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
   initial_config.irqNb        = BSP_IRQ_NUMBER;
   initial_config.defaultEntry = defaultIrq;
   initial_config.irqHdlTbl    = rtemsIrq;
-  initial_config.irqBase      = BSP_ASM_IRQ_VECTOR_BASE;
+  initial_config.irqBase      = BSP_LOWEST_OFFSET;
   initial_config.irqPrioTbl   = irqPrioTable;
 
   if (!BSP_rtems_irq_mngt_set(&initial_config))
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index 28a3b331b3..459b9a865e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.h b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.h
index b9d3cfe49e..69752132fb 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.h
@@ -28,16 +28,10 @@
  */
 
 /*
- * Base index for the module specific irq handlers
- */
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
-#define BSP_IPIC_VECTOR_BASE	BSP_ASM_IRQ_VECTOR_BASE
-
-/*
  * Peripheral IRQ handlers related definitions
  */
 #define BSP_IPIC_PER_IRQ_NUMBER	        128
-#define BSP_IPIC_IRQ_LOWEST_OFFSET   BSP_IPIC_VECTOR_BASE  /* 0 */
+#define BSP_IPIC_IRQ_LOWEST_OFFSET        0
 #define BSP_IPIC_IRQ_MAX_OFFSET      (BSP_IPIC_IRQ_LOWEST_OFFSET\
                                          +BSP_IPIC_PER_IRQ_NUMBER-1)
 
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index e2bc30b32e..3f0f03f4a0 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c, startup/bspstart.c.nocache: Eliminate PowerPC
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
index 09231b34cb..6c78aa6d78 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
@@ -23,8 +23,6 @@
 
 #include <rtems/irq.h>
 
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
-
 #ifndef ASM
 
 #ifdef __cplusplus
@@ -37,8 +35,6 @@ extern volatile unsigned int ppc_cached_irq_mask;
  * Symblolic IRQ names and related definitions.
  */
 
-  /* Base vector for our SIU IRQ handlers. */
-#define BSP_SIU_VECTOR_BASE	BSP_ASM_IRQ_VECTOR_BASE
   /*
    * SIU IRQ handler related definitions
    */
@@ -50,7 +46,7 @@ extern volatile unsigned int ppc_cached_irq_mask;
    * CAUTION : BSP_CPM_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
    */
 #define BSP_CPM_IRQ_NUMBER		32
-#define BSP_CPM_IRQ_LOWEST_OFFSET	(BSP_SIU_IRQ_NUMBER + BSP_SIU_VECTOR_BASE)
+#define BSP_CPM_IRQ_LOWEST_OFFSET	(BSP_SIU_IRQ_NUMBER + BSP_IRQ_LOWEST_OFFSET)
 #define BSP_CPM_IRQ_MAX_OFFSET	 	(BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1)
   /*
    * PowerPc exceptions handled as interrupt where a rtems managed interrupt
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c
index bbb08dae0a..9ef545799e 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c
@@ -126,7 +126,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     initial_config.irqNb 	= BSP_IRQ_NUMBER;
     initial_config.defaultEntry = defaultIrq;
     initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase	= BSP_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqBase	= BSP_LOWEST_OFFSET;
     initial_config.irqPrioTbl	= irqPrioTable;
 
     if (!BSP_rtems_irq_mngt_set(&initial_config)) {
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 7acd599204..90b307a94d 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
index 2d35c12376..1962f68c61 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
@@ -30,8 +30,6 @@
 #define LIBBSP_POWERPC_IRQ_H
 #include <rtems/irq.h>
 
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
-
 #ifndef ASM
 
 #ifdef __cplusplus
@@ -46,15 +44,12 @@ extern volatile unsigned int ppc_cached_irq_mask;
  * Symblolic IRQ names and related definitions.
  */
 
-  /* Base vector for our SIU IRQ handlers. */
-#define BSP_SIU_VECTOR_BASE		(BSP_ASM_IRQ_VECTOR_BASE)
-
   /*
    * CPM IRQ handlers related definitions
    * CAUTION : BSP_CPM_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
    */
 #define BSP_CPM_IRQ_NUMBER		(64)
-#define BSP_CPM_IRQ_LOWEST_OFFSET	(BSP_SIU_VECTOR_BASE)
+#define BSP_CPM_IRQ_LOWEST_OFFSET	(0)
 #define BSP_CPM_IRQ_MAX_OFFSET		(BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1)
   /*
    * PowerPc exceptions handled as interrupt where a rtems managed interrupt
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c
index 1e851116ab..eb08a63c73 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c
@@ -115,7 +115,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     initial_config.irqNb 		= BSP_IRQ_NUMBER;
     initial_config.defaultEntry = defaultIrq;
     initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase		= BSP_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqBase		= BSP_LOWEST_OFFSET;
     initial_config.irqPrioTbl	= irqPrioTable;
 
     if (!BSP_rtems_irq_mngt_set(&initial_config)) {
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index ca875ee145..8116d57110 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
index 9b7c21367e..2fd9e0b0f0 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
@@ -32,8 +32,6 @@
 /*#define BSP_SHARED_HANDLER_SUPPORT      1*/
 #include <rtems/irq.h>
 
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
-
 #ifndef ASM
 
 #define OneTierIrqPrioTbl 1
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
index a56158067f..6472bb1dd3 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
@@ -123,7 +123,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
   initial_config.irqNb 	= BSP_IRQ_NUMBER;
   initial_config.defaultEntry   = defaultIrq;
   initial_config.irqHdlTbl	= rtemsIrq;
-  initial_config.irqBase	= BSP_ASM_IRQ_VECTOR_BASE;
+  initial_config.irqBase	= BSP_LOWEST_OFFSET;
   initial_config.irqPrioTbl	= BSPirqPrioTable;
 
 #ifdef TRACE_IRQ_INIT  
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index efc4cd2c19..15ca06da0b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h b/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
index e7344c9bb7..fb9704e927 100644
--- a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
@@ -47,7 +47,6 @@
 #define ELCRM_INT1_LVL          0x2
 #define ELCRM_INT0_LVL          0x1
 
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
     /* PIC's command and mask registers */
 #define PIC_MASTER_COMMAND_IO_PORT		0x20	/* Master PIC command register */
 #define PIC_SLAVE_COMMAND_IO_PORT		0xa0	/* Slave PIC command register */
@@ -69,8 +68,6 @@ extern "C" {
  * Symbolic IRQ names and related definitions
  */
 
-  /* Base vector for our ISA IRQ handlers. */
-#define BSP_ISA_IRQ_VECTOR_BASE		BSP_ASM_IRQ_VECTOR_BASE
   /*
    * ISA IRQ handler related definitions
    */
diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c b/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c
index f19999694b..95cebae743 100644
--- a/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c
@@ -327,7 +327,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     initial_config.irqNb 	= BSP_IRQ_NUMBER;
     initial_config.defaultEntry = defaultIrq;
     initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase	= BSP_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqBase	= BSP_LOWEST_OFFSET;
     initial_config.irqPrioTbl	= irqPrioTable;
 
     if (!BSP_rtems_irq_mngt_set(&initial_config)) {
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.h b/c/src/lib/libbsp/powerpc/shared/irq/irq.h
index a822e409a6..b1f3d26047 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.h
@@ -47,7 +47,6 @@
 #define ELCRM_INT1_LVL          0x2
 #define ELCRM_INT0_LVL          0x1
 
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
     /* PIC's command and mask registers */
 #define PIC_MASTER_COMMAND_IO_PORT		0x20	/* Master PIC command register */
 #define PIC_SLAVE_COMMAND_IO_PORT		0xa0	/* Slave PIC command register */
@@ -69,8 +68,6 @@ extern "C" {
  * rtems_irq_number Definitions
  */
 
-/* Base vector for our ISA IRQ handlers. */
-#define  BSP_ISA_IRQ_VECTOR_BASE	(BSP_ASM_IRQ_VECTOR_BASE)
 /*
  * ISA IRQ handler related definitions
  */
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index 648477c406..559ee68012 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -351,7 +351,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     initial_config.irqNb 	= BSP_IRQ_NUMBER;
     initial_config.defaultEntry = defaultIrq;
     initial_config.irqHdlTbl	= rtemsIrq;
-    initial_config.irqBase	= BSP_ASM_IRQ_VECTOR_BASE;
+    initial_config.irqBase	= BSP_LOWEST_OFFSET;
     initial_config.irqPrioTbl	= irqPrioTable;
 
     if (!BSP_rtems_irq_mngt_set(&initial_config)) {
diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
index ff94b5db61..0afcb0b995 100644
--- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-30	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq.h, irq/irq_init.c: Removed the definition
+	of ASM_IRQ_VECTOR_BASE; this symbol was only use to
+	initialize the irqBase member of the rtems_irq_global_settings
+	struct. However, irqBase is an rtems_irq_symbolic_name,
+	so using BSP_LOWEST_OFFSET is more appropriate.
+
 2007-11-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Now compiles and links.
diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h b/c/src/lib/libbsp/powerpc/virtex/irq/irq.h
index 815fd3e87a..b9a4413495 100644
--- a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/virtex/irq/irq.h
@@ -28,16 +28,10 @@
  */
 
 /*
- * Base index for the module specific irq handlers
- */
-#define BSP_ASM_IRQ_VECTOR_BASE 0x0
-#define BSP_OPBINTC_VECTOR_BASE	BSP_ASM_IRQ_VECTOR_BASE
-
-/*
  * Peripheral IRQ handlers related definitions
  */
 #define BSP_OPBINTC_PER_IRQ_NUMBER	XPAR_INTC_MAX_NUM_INTR_INPUTS
-#define BSP_OPBINTC_IRQ_LOWEST_OFFSET   BSP_OPBINTC_VECTOR_BASE  /* 0 */
+#define BSP_OPBINTC_IRQ_LOWEST_OFFSET   0
 #define BSP_OPBINTC_IRQ_MAX_OFFSET      (BSP_OPBINTC_IRQ_LOWEST_OFFSET\
                                          +BSP_OPBINTC_PER_IRQ_NUMBER-1)