Move of the stuff away from dragonfire.h to xpele.h

diff --git a/drivers/serial/serial_xpssuart.h b/drivers/serial/serial_xpssuart.h
index ba7ec90d40bd2c117ef5bd4dd495f1814406e83e..11b8aea84b402be9240da028090c0c8abadb8a4b 100644 (file)
--- a/drivers/serial/serial_xpssuart.h
+++ b/drivers/serial/serial_xpssuart.h
@@ -9,8 +9,6 @@
 
 #include <asm/io.h>
 
-#include <dragonfire.h>
-
 #if defined(CONFIG_UART0)
 # define UART_ID   0
 # define UART_BASE DRAGONFIRE_UART0_BASE

diff --git a/include/asm-arm/arch-dragonfire/ttc.h b/include/asm-arm/arch-dragonfire/ttc.h
index 48b44e792149825204a2c5a38d4d423b0b67f8e3..0b2d1a6b67937479b8822d10be50fa2f51b769d4 100644 (file)
--- a/include/asm-arm/arch-dragonfire/ttc.h
+++ b/include/asm-arm/arch-dragonfire/ttc.h
@@ -8,8 +8,6 @@
 
 #include <asm/io.h>
 
-#include <dragonfire.h>
-
 #if defined(CONFIG_TTC0)
 # define TTC_ID   0
 # define TTC_BASE DRAGONFIRE_TTC0_BASE

diff --git a/include/configs/xpele.h b/include/configs/xpele.h
index 9e96bc06c05b62d2f1192913d971389f562a2bb7..66abf5fb4879d2168e3cf7c1ecdf67bec78921b9 100644 (file)
--- a/include/configs/xpele.h
+++ b/include/configs/xpele.h
@@ -134,4 +134,37 @@
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
+
+
+
+
+
+
+/* UART base addresses */
+#define DRAGONFIRE_UART0_BASE 0xE0000000
+#define DRAGONFIRE_UART1_BASE 0xE0001000
+
+#ifdef PELE_TTC
+       /* For PELE the base address has changed*/
+       #define DRAGONFIRE_TTC0_BASE 0x90001000
+       #define DRAGONFIRE_TTC1_BASE 0x90002000
+
+#else
+
+       /* Timers forf DFE */
+       #define DRAGONFIRE_TTC0_BASE 0xFE001000
+       #define DRAGONFIRE_TTC1_BASE 0xFE002000
+#endif
+
+/* GEMs */
+#define DRAGONFIRE_GEM0_BASE 0xE000B000
+#define DRAGONFIRE_GEM1_BASE 0xE000C000
+
+
+
+
+
+
+
+
 #endif /* __CONFIG_H */

diff --git a/include/dragonfire.h b/include/dragonfire.h
deleted file mode 100644 (file)
index 1fbaeb1..0000000
--- a/include/dragonfire.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Semi-blindly hacked together.
- */
-
-#ifndef __DRAGONFIRE_H__
-#define __DRAGONFIRE_H__
-
-/* UART base addresses */
-#define DRAGONFIRE_UART0_BASE 0xE0000000
-#define DRAGONFIRE_UART1_BASE 0xE0001000
-
-#ifdef PELE_TTC
-       /* For PELE the base address has changed*/
-       #define DRAGONFIRE_TTC0_BASE 0x90001000
-       #define DRAGONFIRE_TTC1_BASE 0x90002000
-
-#else
-
-       /* Timers forf DFE */
-       #define DRAGONFIRE_TTC0_BASE 0xFE001000
-       #define DRAGONFIRE_TTC1_BASE 0xFE002000
-#endif
-
-/* GEMs */
-#define DRAGONFIRE_GEM0_BASE 0xE000B000
-#define DRAGONFIRE_GEM1_BASE 0xE000C000
-
-#endif /* __DRAGONFIRE_H__ */