move-kboot.h-to-include.patch

Signed-off-by: Andy Green <andy@openmoko.com>

qiboot/include/qi-serial.h

@@ -0,0 +1,112 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Author: xiangfu liu <xiangfu@openmoko.org>
+ *
+ * Configuation settings for the FIC Neo GTA02 Linux GSM phone
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+
+#ifndef __SERIAL_H__
+#define __SERIAL_H__
+
+#define UART0	    0
+#define UART1	    1
+#define UART2	    2
+
+#define rGPHCON     (*(volatile unsigned *)0x56000070)	/*UART 0 Line control*/
+
+#define rULCON0     (*(volatile unsigned *)0x50000000)	/*UART 0 Line control*/
+#define rUCON0      (*(volatile unsigned *)0x50000004)	/*UART 0 Control*/
+#define rUFCON0     (*(volatile unsigned *)0x50000008)	/*UART 0 FIFO control*/
+#define rUMCON0     (*(volatile unsigned *)0x5000000c)	/*UART 0 Modem control*/
+#define rUTRSTAT0   (*(volatile unsigned *)0x50000010)	/*UART 0 Tx/Rx status*/
+#define rUERSTAT0   (*(volatile unsigned *)0x50000014)	/*UART 0 Rx error status*/
+#define rUFSTAT0    (*(volatile unsigned *)0x50000018)	/*UART 0 FIFO status*/
+#define rUMSTAT0    (*(volatile unsigned *)0x5000001c)	/*UART 0 Modem status*/
+#define rUBRDIV0    (*(volatile unsigned *)0x50000028)	/*UART 0 Baud rate divisor*/
+
+#define rULCON1     (*(volatile unsigned *)0x50004000)	/*UART 1 Line control*/
+#define rUCON1      (*(volatile unsigned *)0x50004004)	/*UART 1 Control*/
+#define rUFCON1     (*(volatile unsigned *)0x50004008)	/*UART 1 FIFO control*/
+#define rUMCON1     (*(volatile unsigned *)0x5000400c)	/*UART 1 Modem control*/
+#define rUTRSTAT1   (*(volatile unsigned *)0x50004010)	/*UART 1 Tx/Rx status*/
+#define rUERSTAT1   (*(volatile unsigned *)0x50004014)	/*UART 1 Rx error status*/
+#define rUFSTAT1    (*(volatile unsigned *)0x50004018)	/*UART 1 FIFO status*/
+#define rUMSTAT1    (*(volatile unsigned *)0x5000401c)	/*UART 1 Modem status*/
+#define rUBRDIV1    (*(volatile unsigned *)0x50004028)	/*UART 1 Baud rate divisor*/
+
+#define rULCON2     (*(volatile unsigned *)0x50008000)	/*UART 2 Line control*/
+#define rUCON2      (*(volatile unsigned *)0x50008004)	/*UART 2 Control*/
+#define rUFCON2     (*(volatile unsigned *)0x50008008)	/*UART 2 FIFO control*/
+#define rUTRSTAT2   (*(volatile unsigned *)0x50008010)	/*UART 2 Tx/Rx status*/
+#define rUERSTAT2   (*(volatile unsigned *)0x50008014)	/*UART 2 Rx error status*/
+#define rUFSTAT2    (*(volatile unsigned *)0x50008018)	/*UART 2 FIFO status*/
+#define rUBRDIV2    (*(volatile unsigned *)0x50008028)	/*UART 2 Baud rate divisor*/
+
+#define WrUTXH0(ch) (*(volatile unsigned char *)0x50000020)=(unsigned char)(ch)
+#define RdURXH0()   (*(volatile unsigned char *)0x50000024)
+#define WrUTXH1(ch) (*(volatile unsigned char *)0x50004020)=(unsigned char)(ch)
+#define RdURXH1()   (*(volatile unsigned char *)0x50004024)
+#define WrUTXH2(ch) (*(volatile unsigned char *)0x50008020)=(unsigned char)(ch)
+#define RdURXH2()   (*(volatile unsigned char *)0x50008024)
+
+
+
+// I/O PORT 
+#define rGPACON			(*(volatile unsigned *)0x56000000)
+#define rGPADAT			(*(volatile unsigned *)0x56000004)
+
+#define rGPBCON			(*(volatile unsigned *)0x56000010)
+#define rGPBDAT			(*(volatile unsigned *)0x56000014)
+#define rGPBUP			(*(volatile unsigned *)0x56000018)
+
+#define rGPCCON			(*(volatile unsigned *)0x56000020)
+#define rGPCDAT			(*(volatile unsigned *)0x56000024)
+#define rGPCUP			(*(volatile unsigned *)0x56000028)
+
+#define rGPDCON			(*(volatile unsigned *)0x56000030)
+#define rGPDDAT			(*(volatile unsigned *)0x56000034)
+#define rGPDUP			(*(volatile unsigned *)0x56000038)
+
+#define rGPECON			(*(volatile unsigned *)0x56000040)
+#define rGPEDAT			(*(volatile unsigned *)0x56000044)
+#define rGPEUP			(*(volatile unsigned *)0x56000048)
+
+#define rGPFCON			(*(volatile unsigned *)0x56000050)
+#define rGPFDAT			(*(volatile unsigned *)0x56000054)
+#define rGPFUP			(*(volatile unsigned *)0x56000058)
+
+#define rGPGCON			(*(volatile unsigned *)0x56000060)
+#define rGPGDAT			(*(volatile unsigned *)0x56000064)
+#define rGPGUP			(*(volatile unsigned *)0x56000068)
+
+#define rGPHCON			(*(volatile unsigned *)0x56000070)
+#define rGPHDAT			(*(volatile unsigned *)0x56000074)
+#define rGPHUP			(*(volatile unsigned *)0x56000078)
+
+#define rGPJCON    			(*(volatile unsigned *)0x560000d0)	//Port J control
+#define rGPJDAT   			(*(volatile unsigned *)0x560000d4)	//Port J data
+#define rGPJUP			(*(volatile unsigned *)0x560000d8)	//Port J data
+
+void port_init(void);
+void serial_init (const int ubrdiv_val,const int uart);
+void serial_putc (const int uart,const char c);
+int printk(const char *fmt, ...);
+int puts(const char *string);
+
+#endif

qiboot/include/qi.h

@@ -18,12 +18,17 @@
  * MA 02111-1307 USA
  */
 
-#ifndef __KBOOT_H__
+#ifndef __QI_H__
-#define __KBOOT_H__
+#define __QI_H__
 
 #include <stdarg.h>
-#include "serial.h"
+#include <qi-serial.h>
-#include "ctype.h"
+#include <qi-ctype.h>
+
+#define u32 unsigned int
+#define u16 unsigned short
+#define u8 unsigned char
+typedef unsigned int uint32_t;
 
 int printk(const char *fmt, ...);
 int vsprintf(char *buf, const char *fmt, va_list args);

qiboot/src/ctype.c

@@ -1,4 +1,4 @@
-#include "ctype.h"
+#include <qi-ctype.h>
 
 unsigned char _ctype[] = {
 _C,_C,_C,_C,_C,_C,_C,_C,                        /* 0-7 */

qiboot/src/nand_read.c

@@ -18,8 +18,8 @@
 /* NOTE this stuff runs in steppingstone context! */
 
 
+#include <qi.h>
 #include "nand_read.h"
-#include "kboot.h"
 
 #define NAND_CMD_READ0 0
 #define NAND_CMD_READSTART 0x30

qiboot/src/phase2.c

@@ -21,16 +21,12 @@
  * MA 02111-1307 USA
  */
 
-#include "kboot.h"
+#include <qi.h>
 #include <neo_gta02.h>
 #include "blink_led.h"
 #include <string.h>
 #define __ARM__
 #include <image.h>
-#define u32 unsigned int
-#define u16 unsigned short
-#define u8 unsigned char
-typedef unsigned int uint32_t;
 
 #include <setup.h>
 #include "nand_read.h"

qiboot/src/serial.c

@@ -20,8 +20,8 @@
  * MA 02111-1307 USA
  */
 
+#include <qi.h>
 #include "blink_led.h"
-#include "kboot.h"
 
 void serial_init (const int uart)
 {

qiboot/src/start_kboot.c

@@ -24,9 +24,9 @@
 /* NOTE this stuff runs in steppingstone context! */
 
 
+#include <qi.h>
 #include "blink_led.h"
 #include "nand_read.h"
-#include "kboot.h"
 #include <neo_gta02.h>
 
 #define stringify2(s) stringify1(s)

qiboot/src/utils.c

@@ -20,7 +20,7 @@
  * MA 02111-1307 USA
  */
 
-#include "kboot.h"
+#include <qi.h>
 #include <string.h>
 
 #define DEBUG_CONSOLE_UART UART2