Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c
index 3b9b0207a3354fa18235bf60a73fdf1a70a09a61..0f35caa9be664ebc2138f53f89db3ba272dffe6a 100644 (file)
--- a/board/versatile/versatile.c
+++ b/board/versatile/versatile.c
@@ -37,10 +37,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void flash__init (void);
-void ether__init (void);
-void peripheral_power_enable (void);
-
 #if defined(CONFIG_SHOW_BOOT_PROGRESS)
 void show_boot_progress(int progress)
 {
@@ -82,8 +78,6 @@ int board_init (void)
 
        icache_enable ();
 
-       flash__init ();
-       ether__init ();
        return 0;
 }
 
@@ -94,22 +88,6 @@ int misc_init_r (void)
        return (0);
 }
 
-/******************************
- Routine:
- Description:
-******************************/
-void flash__init (void)
-{
-}
-/*************************************************************
- Routine:ether__init
- Description: take the Ethernet controller out of reset and wait
-                          for the EEPROM load to complete.
-*************************************************************/
-void ether__init (void)
-{
-}
-
 /******************************
  Routine:
  Description:

diff --git a/cpu/arm1136/mx31/interrupts.c b/cpu/arm1136/mx31/interrupts.c
index b36c58c6ac59ba771bf01fb713ec53541834a1b7..ab7202fef2ad881116edd041d9a4067838cf9330 100644 (file)
--- a/cpu/arm1136/mx31/interrupts.c
+++ b/cpu/arm1136/mx31/interrupts.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <asm/arch/mx31-regs.h>
+#include <div64.h>
 
 #define TIMER_BASE 0x53f90000 /* General purpose timer 1 */
 
@@ -38,24 +39,55 @@
 #define GPTCR_CLKSOURCE_32     (4 << 6)        /* Clock source         */
 #define GPTCR_TEN              1               /* Timer enable         */
 
+static ulong timestamp;
+static ulong lastinc;
+
 /* "time" is measured in 1 / CONFIG_SYS_HZ seconds, "tick" is internal timer period */
 #ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
 /* ~0.4% error - measured with stop-watch on 100s boot-delay */
-#define TICK_TO_TIME(t)        ((t) * CONFIG_SYS_HZ / CONFIG_MX31_CLK32)
-#define TIME_TO_TICK(t)        ((unsigned long long)(t) * CONFIG_MX31_CLK32 / CONFIG_SYS_HZ)
-#define US_TO_TICK(t)  (((unsigned long long)(t) * CONFIG_MX31_CLK32 + \
-                       999999) / 1000000)
+static inline unsigned long long tick_to_time(unsigned long long tick)
+{
+       tick *= CONFIG_SYS_HZ;
+       do_div(tick, CONFIG_MX31_CLK32);
+       return tick;
+}
+
+static inline unsigned long long time_to_tick(unsigned long long time)
+{
+       time *= CONFIG_MX31_CLK32;
+       do_div(time, CONFIG_SYS_HZ);
+       return time;
+}
+
+static inline unsigned long long us_to_tick(unsigned long long us)
+{
+       us = us * CONFIG_MX31_CLK32 + 999999;
+       do_div(us, 1000000);
+       return us;
+}
 #else
 /* ~2% error */
 #define TICK_PER_TIME  ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
 #define US_PER_TICK    (1000000 / CONFIG_MX31_CLK32)
-#define TICK_TO_TIME(t)        ((t) / TICK_PER_TIME)
-#define TIME_TO_TICK(t)        ((unsigned long long)(t) * TICK_PER_TIME)
-#define US_TO_TICK(t)  (((t) + US_PER_TICK - 1) / US_PER_TICK)
-#endif
 
-static ulong timestamp;
-static ulong lastinc;
+static inline unsigned long long tick_to_time(unsigned long long tick)
+{
+       do_div(tick, TICK_PER_TIME);
+       return tick;
+}
+
+static inline unsigned long long time_to_tick(unsigned long long time)
+{
+       return time * TICK_PER_TIME;
+}
+
+static inline unsigned long long us_to_tick(unsigned long long us)
+{
+       us += US_PER_TICK - 1;
+       do_div(us, US_PER_TICK);
+       return us;
+}
+#endif
 
 /* nothing really to do with interrupts, just starts up a counter. */
 /* The 32768Hz 32-bit timer overruns in 131072 seconds */
@@ -107,7 +139,7 @@ ulong get_timer_masked (void)
         * 5 * 10^9 days... and get_ticks() * CONFIG_SYS_HZ wraps in
         * 5 * 10^6 days - long enough.
         */
-       return TICK_TO_TIME(get_ticks());
+       return tick_to_time(get_ticks());
 }
 
 ulong get_timer (ulong base)
@@ -117,7 +149,7 @@ ulong get_timer (ulong base)
 
 void set_timer (ulong t)
 {
-       timestamp = TIME_TO_TICK(t);
+       timestamp = time_to_tick(t);
 }
 
 /* delay x useconds AND perserve advance timstamp value */
@@ -126,7 +158,7 @@ void udelay (unsigned long usec)
        unsigned long long tmp;
        ulong tmo;
 
-       tmo = US_TO_TICK(usec);
+       tmo = us_to_tick(usec);
        tmp = get_ticks() + tmo;        /* get current timestamp */
 
        while (get_ticks() < tmp)       /* loop till event */

diff --git a/cpu/arm926ejs/Makefile b/cpu/arm926ejs/Makefile
index 0facce4703154856ba1784422c371286f576b410..d5ac7d3fd980e66e909bbe55dadaf3c3906c3737 100644 (file)
--- a/cpu/arm926ejs/Makefile
+++ b/cpu/arm926ejs/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(CPU).a
 
 START  = start.o
-COBJS  = interrupts.o cpu.o cpuinfo.o
+COBJS  = interrupts.o cpu.o
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS) $(SOBJS))

diff --git a/cpu/arm926ejs/omap/Makefile b/cpu/arm926ejs/omap/Makefile
index c335d5c8665363cf51b45d1b1d6a9816fa21b583..74aea741892e93ebf4754ec10ed500031bc2cae2 100644 (file)
--- a/cpu/arm926ejs/omap/Makefile
+++ b/cpu/arm926ejs/omap/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(SOC).a
 
-COBJS  = timer.o
+COBJS  = timer.o cpuinfo.o
 SOBJS  = reset.o
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)

diff --git a/cpu/arm926ejs/cpuinfo.c b/cpu/arm926ejs/omap/cpuinfo.c
similarity index 100%
rename from cpu/arm926ejs/cpuinfo.c
rename to cpu/arm926ejs/omap/cpuinfo.c