2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* libcpu/powerpc/mpc55xx/include/irq.h: Move defines from
	'libbsp/powerpc/mpc55xxevb/include/irq-config.h'.
	* libbsp/powerpc/mpc55xxevb/include/irq-config.h: Removed file.
	* libbsp/powerpc/mpc55xxevb/Makefile.am,
	libbsp/powerpc/mpc55xxevb/preinstall.am: Reflect changes above.

6 files changed, 32 insertions, 82 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
index 505a0e029e..ef972c49b6 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-30	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/irq-config.h: Removed file.
+	* Makefile.am, preinstall.am: Reflect changes above.
+
 2010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* configure.ac, startup/bspstart.c:
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 4e01e9c132..fdf58795c5 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -36,7 +36,6 @@ include_HEADERS += ../../shared/include/tm27.h
 nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h \
     ../../shared/include/coverhd.h
 include_bsp_HEADERS = include/mpc55xxevb.h \
-    include/irq-config.h \
     include/smsc9218i.h \
     ../../shared/include/irq-generic.h \
     ../../shared/include/irq-info.h \
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/irq-config.h b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/irq-config.h
deleted file mode 100644
index d1ecd56da7..0000000000
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/irq-config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief BSP interrupt support configuration.
- */
-
-/*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems@embedded-brains.de
- *
- * The license and distribution terms for this file may be found in the file
- * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
- */
-
-#ifndef LIBBSP_POWERPC_MPC55XXEVB_IRQ_CONFIG_H
-#define LIBBSP_POWERPC_MPC55XXEVB_IRQ_CONFIG_H
-
-#include <stdint.h>
-
-/**
- * @addtogroup bsp_interrupt
- *
- * @{
- */
-
-/**
- * @brief Minimum vector number.
- */
-#define BSP_INTERRUPT_VECTOR_MIN 0
-
-/**
- * @brief Maximum vector number.
- */
-#define BSP_INTERRUPT_VECTOR_MAX 328
-
-/**
- * @brief Enables the index table.
- *
- * If you enable the index table, you have to define a size for the handler
- * table (@ref BSP_INTERRUPT_HANDLER_TABLE_SIZE) and must provide an integer
- * type capable to index the complete handler table (@ref
- * bsp_interrupt_handler_index_type).
- */
-#define BSP_INTERRUPT_USE_INDEX_TABLE
-
-/**
- * @brief Disables usage of the heap.
- *
- * If you define this, you have to define @ref BSP_INTERRUPT_USE_INDEX_TABLE as
- * well.
- */
-#define BSP_INTERRUPT_NO_HEAP_USAGE
-
-#ifdef BSP_INTERRUPT_USE_INDEX_TABLE
-
-/**
- * @brief Size of the handler table.
- */
-#define BSP_INTERRUPT_HANDLER_TABLE_SIZE 63
-
-/**
- * @brief Integer type capable to index the complete handler table.
- */
-typedef uint8_t bsp_interrupt_handler_index_type;
-
-#endif /* BSP_INTERRUPT_USE_INDEX_TABLE */
-
-/** @} */
-
-#endif /* LIBBSP_POWERPC_MPC55XXEVB_IRQ_CONFIG_H */
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
index c5b15b6943..5b3a5b3cf5 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
@@ -85,10 +85,6 @@ $(PROJECT_INCLUDE)/bsp/mpc55xxevb.h: include/mpc55xxevb.h $(PROJECT_INCLUDE)/bsp
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc55xxevb.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc55xxevb.h
 
-$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h
-
 $(PROJECT_INCLUDE)/bsp/smsc9218i.h: include/smsc9218i.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smsc9218i.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smsc9218i.h
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index f452ac7128..d976490f1c 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-30	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* mpc55xx/include/irq.h: Move defines from
+	'libbsp/powerpc/mpc55xxevb/include/irq-config.h'.
+
 2010-04-28	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	* mpc5xx/clock/clock.c, mpc5xx/console-generic/console-generic.c,
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
index 37efaa7529..811b246033 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
+ * Copyright (c) 2008, 2010
  * Embedded Brains GmbH
  * Obere Lagerstr. 30
  * D-82178 Puchheim
@@ -159,6 +159,27 @@ rtems_status_code mpc55xx_intc_raise_software_irq( rtems_vector_number vector);
 
 rtems_status_code mpc55xx_intc_clear_software_irq( rtems_vector_number vector);
 
+/**
+ * @addtogroup bsp_interrupt
+ *
+ * @{
+ */
+
+#define BSP_INTERRUPT_VECTOR_MIN 0
+
+#define BSP_INTERRUPT_VECTOR_MAX 328
+
+#define BSP_INTERRUPT_USE_INDEX_TABLE
+
+#define BSP_INTERRUPT_NO_HEAP_USAGE
+
+#ifdef BSP_INTERRUPT_USE_INDEX_TABLE
+  #define BSP_INTERRUPT_HANDLER_TABLE_SIZE 63
+  typedef uint8_t bsp_interrupt_handler_index_type;
+#endif
+
+/** @} */
+
 #ifdef __cplusplus
 };
 #endif /* __cplusplus */