From 16d58e83155fd6b84a78b641d077c74ecc77abf0 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 30 Apr 2010 12:34:37 +0000
Subject: 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'.
---
 c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog          |  6 +++
 c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am        |  1 -
 .../lib/libbsp/powerpc/mbx8xx/include/irq-config.h | 47 ----------------------
 c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h          |  3 ++
 c/src/lib/libbsp/powerpc/mbx8xx/preinstall.am      |  4 --
 5 files changed, 9 insertions(+), 52 deletions(-)
 delete mode 100644 c/src/lib/libbsp/powerpc/mbx8xx/include/irq-config.h

(limited to 'c/src/lib/libbsp/powerpc/mbx8xx')

diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 2f46f3f764..ff1f7364de 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/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'.
+
 2010-04-25	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	* console/console.c, ide/pcmcia_ide.c, startup/bspstart.c,
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
index ed8ac4f748..23d1c017cb 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 include_HEADERS += include/coverhd.h
 include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h \
 	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/mbx8xx/include/irq-config.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/irq-config.h
deleted file mode 100644
index da5bbbec5d..0000000000
--- a/c/src/lib/libbsp/powerpc/mbx8xx/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/mbx8xx/irq/irq.h b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
index c4d5a84a6d..f7187e2756 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
@@ -135,6 +135,9 @@ extern volatile unsigned int ppc_cached_irq_mask;
      */
 #define BSP_DECREMENTER			BSP_PROCESSOR_IRQ_LOWEST_OFFSET
 
+#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/mbx8xx/preinstall.am b/c/src/lib/libbsp/powerpc/mbx8xx/preinstall.am
index 5267b248ed..077305f7a1 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/preinstall.am
@@ -68,10 +68,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
-- 
cgit v1.2.3