vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc / platforms / 4xx / ebony.h

diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
index 749fff9..d8f0e1d 100755 (executable)
--- a/arch/ppc/platforms/4xx/ebony.h
+++ b/arch/ppc/platforms/4xx/ebony.h
@@ -40,31 +40,32 @@
 #define EBONY_RTC_SIZE         0x2000
 
 /* Flash */
-#define EBONY_FPGA_ADDR                0x0000000148300000
+#define EBONY_FPGA_ADDR                0x0000000148300000ULL
 #define EBONY_BOOT_SMALL_FLASH(x)      (x & 0x20)
 #define EBONY_ONBRD_FLASH_EN(x)                (x & 0x02)
 #define EBONY_FLASH_SEL(x)             (x & 0x01)
-#define EBONY_SMALL_FLASH_LOW1 0x00000001ff800000
-#define EBONY_SMALL_FLASH_LOW2 0x00000001ff880000
-#define EBONY_SMALL_FLASH_HIGH1        0x00000001fff00000
-#define EBONY_SMALL_FLASH_HIGH2        0x00000001fff80000
+#define EBONY_SMALL_FLASH_LOW1 0x00000001ff800000ULL
+#define EBONY_SMALL_FLASH_LOW2 0x00000001ff880000ULL
+#define EBONY_SMALL_FLASH_HIGH1        0x00000001fff00000ULL
+#define EBONY_SMALL_FLASH_HIGH2        0x00000001fff80000ULL
 #define EBONY_SMALL_FLASH_SIZE 0x80000
-#define EBONY_LARGE_FLASH_LOW  0x00000001ff800000
-#define EBONY_LARGE_FLASH_HIGH 0x00000001ffc00000
+#define EBONY_LARGE_FLASH_LOW  0x00000001ff800000ULL
+#define EBONY_LARGE_FLASH_HIGH 0x00000001ffc00000ULL
 #define EBONY_LARGE_FLASH_SIZE 0x400000
 
-#define EBONY_SMALL_FLASH_BASE 0x00000001fff80000
-#define EBONY_LARGE_FLASH_BASE 0x00000001ff800000
+#define EBONY_SMALL_FLASH_BASE 0x00000001fff80000ULL
+#define EBONY_LARGE_FLASH_BASE 0x00000001ff800000ULL
 
 /*
  * Serial port defines
  */
 
 /* OpenBIOS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xE0000200
-#define UART1_IO_BASE  (u8 *) 0xE0000300
+#define UART0_IO_BASE  0xE0000200
+#define UART1_IO_BASE  0xE0000300
 
-#define BASE_BAUD      33000000/3/16
+/* external Epson SG-615P */
+#define BASE_BAUD      691200
 
 #define STD_UART_OP(num)                                       \
        { 0, BASE_BAUD, 0, UART##num##_INT,                     \