Remove time/delay related functions from lib_bootstrap, we don't need them anymore

diff --git a/u-boot/lib_bootstrap/Makefile b/u-boot/lib_bootstrap/Makefile
index bdcc7a1c1b8475ba4ccd10a35607cd6c7a81a6e7..015dbf6d36c49d3bb16c7aa8b5f9507aee52e282 100644 (file)
--- a/u-boot/lib_bootstrap/Makefile
+++ b/u-boot/lib_bootstrap/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = libbootstrap.a
 
-OBJS   = bootstrap_board.o LzmaDecode.o string.o crc32.o LzmaWrapper.o time.o
+OBJS   = bootstrap_board.o LzmaDecode.o string.o crc32.o LzmaWrapper.o
 
 CFLAGS += -DCONFIG_LZMA=1
 

diff --git a/u-boot/lib_bootstrap/bootstrap_board.c b/u-boot/lib_bootstrap/bootstrap_board.c
index c39048d076fad098fd727fb11848de13ea9082ff..ab1797c3881e0fb4b326928671dccb54daa2121a 100644 (file)
--- a/u-boot/lib_bootstrap/bootstrap_board.c
+++ b/u-boot/lib_bootstrap/bootstrap_board.c
@@ -122,8 +122,7 @@ static int init_func_ram(void)
  */
 typedef int(init_fnc_t)(void);
 
-init_fnc_t *init_sequence[] = { timer_init,
-                                                               init_func_ram,
+init_fnc_t *init_sequence[] = { init_func_ram,
                                                                NULL, };
 
 void bootstrap_board_init_f(ulong bootflag)

diff --git a/u-boot/lib_bootstrap/time.c b/u-boot/lib_bootstrap/time.c
deleted file mode 100644 (file)
index 709d385..0000000
--- a/u-boot/lib_bootstrap/time.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-#include <common.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static inline void mips_compare_set(u32 v){
-       asm volatile ("mtc0 %0, $11" : : "r" (v));
-}
-
-static inline void mips_count_set(u32 v){
-       asm volatile ("mtc0 %0, $9" : : "r" (v));
-}
-
-static inline u32 mips_count_get(void){
-       u32 count;
-
-       asm volatile ("mfc0 %0, $9" : "=r" (count) :);
-       return(count);
-}
-
-/*
- * timer without interrupts
- */
-int timer_init(void){
-       mips_compare_set(0);
-       mips_count_set(0);
-
-       return(0);
-}
-
-ulong get_timer(ulong base){
-       return(mips_count_get() - base);
-}
-
-void udelay(unsigned long usec){
-       ulong tmo;
-       ulong start = get_timer(0);
-       bd_t *bd = gd->bd;
-
-       /*
-        * We don't have filled the bd->bi_cfg_hz
-        * before relocation to RAM (bd is read only before that),
-        */
-       if((gd->flags & GD_FLG_RELOC) == 0){
-               tmo = usec * (CFG_HZ_FALLBACK / 1000000);
-       } else {
-               tmo = usec * (CFG_HZ / 1000000);
-       }
-
-       while ((ulong)((mips_count_get() - start)) < tmo)
-               /*NOP*/;
-}