From 4adc376ba22148215c845596331d6d13efa622a0 Mon Sep 17 00:00:00 2001 From: xiangfu Date: Sat, 16 Aug 2008 10:24:29 -0400 Subject: [PATCH] mv some .h file to src/ there are same files. --- qiboot/Makefile | 2 +- qiboot/include/blink_led.h | 42 -------------- qiboot/include/nand_read.h | 22 -------- qiboot/include/serial.h | 112 ------------------------------------- qiboot/src/blink_led.h | 1 + 5 files changed, 2 insertions(+), 177 deletions(-) delete mode 100644 qiboot/include/blink_led.h delete mode 100644 qiboot/include/nand_read.h delete mode 100644 qiboot/include/serial.h diff --git a/qiboot/Makefile b/qiboot/Makefile index 1a73ddb..22851f2 100644 --- a/qiboot/Makefile +++ b/qiboot/Makefile @@ -64,9 +64,9 @@ ${OBJS}:${SRCS} ${UDFU_IMAGE}:${OBJS} $(LD) ${LDFLAGS} -T$(LDS) -g $(OBJS) -o ${TARGET} ${LIBS} $(OBJCOPY) -O binary -S ${TARGET} ${IMAGE} + $(OBJDUMP) -D ${TARGET} >${IMAGE}.dis $(MKUDFU) -v ${UDFU_VID} -p ${UDFU_PID} -r ${UDFU_REV} \ -d ${IMAGE} ${UDFU_IMAGE} - $(OBJDUMP) -D ${TARGET} >${IMAGE}.dis blink_led:src/led_on.S $(CC) $(CFLAGS) led_on.o led_on.S diff --git a/qiboot/include/blink_led.h b/qiboot/include/blink_led.h deleted file mode 100644 index a32f395..0000000 --- a/qiboot/include/blink_led.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * (C) Copyright 2007 OpenMoko, Inc. - * Author: xiangfu liu - * - * 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 __BLINK_LED_H -#define __BLINK_LED_H - -#define GPBCON (*(volatile unsigned *)0x56000010) -#define GPBDAT (*(volatile unsigned *)0x56000014) -#define GPBDW (*(volatile unsigned *)0x56000018) -#define ORANGE_OFF() (GPBDAT &= ~(0x1)) -#define BLUE_OFF() (GPBDAT &= ~(0x2)) -#define ORANGE_ON() (GPBDAT |= (0x1)) -#define BLUE_ON() (GPBDAT |= (0x2)) - -#define ORANGE 1; -#define BLUE 0; - -int orange_on(int times); -int blue_on(int times); -int blink_led(void); -int delay(int time); - -#endif /* __BLINK_LED_H */ diff --git a/qiboot/include/nand_read.h b/qiboot/include/nand_read.h deleted file mode 100644 index 71aeda5..0000000 --- a/qiboot/include/nand_read.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * nand_read.c: Simple NAND read functions for booting from NAND - * - * This is used by cpu/arm920/start.S assembler code, - * and the board-specific linker script must make sure this - * file is linked within the first 4kB of NAND flash. - * - * Taken from GPLv2 licensed vivi bootloader, - * Copyright (C) 2002 MIZI Research, Inc. - * - * Author: Hwang, Chideok - * Date : $Date: 2004/02/04 10:37:37 $ - * - * u-boot integration and bad-block skipping (C) 2006 by OpenMoko, Inc. - * Author: Harald Welte - */ -#ifndef __NAND_READ_H -#define __NAND_READ_H - -int nand_read_ll(unsigned char *buf, unsigned long start_addr, int size); - -#endif /* __NAND_READ_H */ diff --git a/qiboot/include/serial.h b/qiboot/include/serial.h deleted file mode 100644 index c10a386..0000000 --- a/qiboot/include/serial.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * (C) Copyright 2007 OpenMoko, Inc. - * Author: xiangfu liu - * - * 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 uart); -void serial_putc (const int uart,const char c); -int printk(const char *fmt, ...); -int puts(const char *string); - -#endif diff --git a/qiboot/src/blink_led.h b/qiboot/src/blink_led.h index 8485404..a32f395 100644 --- a/qiboot/src/blink_led.h +++ b/qiboot/src/blink_led.h @@ -37,5 +37,6 @@ int orange_on(int times); int blue_on(int times); int blink_led(void); +int delay(int time); #endif /* __BLINK_LED_H */