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

	* include/irq-config.h: Removed file.
	* Makefile.am, preinstall.am: Reflect change above.
	* include/irq.h: Moved defines from 'include/irq-config.h'.

5 files changed, 9 insertions, 52 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 3af3aeef6a..4d58fbac6b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-30	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/irq-config.h: Removed file.
+	* Makefile.am, preinstall.am: Reflect change above.
+	* include/irq.h: Moved defines from 'include/irq-config.h'.
+
 2009-11-03	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* start/start.S: checked and removed boot_card warning
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index d3ac98c2fa..647cf004b2 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -37,7 +37,6 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
 libbsp_a_SOURCES += console/console.c
 
 include_bsp_HEADERS = irq/irq.h \
-	include/irq-config.h \
 	../../shared/include/irq-generic.h \
 	../../shared/include/irq-info.h
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/irq-config.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/irq-config.h
deleted file mode 100644
index da5bbbec5d..0000000000
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/irq-config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief BSP interrupt support configuration.
- */
-
-/*
- * Copyright (c) 2009
- * 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_MBX8XX_IRQ_CONFIG_H
-#define LIBBSP_POWERPC_MBX8XX_IRQ_CONFIG_H
-
-#include <stdint.h>
-
-#include <bsp/irq.h>
-
-/**
- * @addtogroup bsp_interrupt
- *
- * @{
- */
-
-/**
- * @brief Minimum vector number.
- */
-#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
-
-/**
- * @brief Maximum vector number.
- */
-#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
-
-/** @} */
-
-#endif /* LIBBSP_POWERPC_MBX8XX_IRQ_CONFIG_H */
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
index 1962f68c61..abeb93ec15 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
@@ -143,6 +143,9 @@ extern volatile unsigned int ppc_cached_irq_mask;
 #define BSP_DECREMENTER			(BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
 #define BSP_PERIODIC_TIMER		(BSP_DECREMENTER)
 
+#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
+
+#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
 
 #define CPM_INTERRUPT
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
index d43f129cd1..95260868e6 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
@@ -69,10 +69,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.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/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h