mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-23 03:19:43 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-arm
This commit is contained in:
commit
2e4dcb64d1
@ -37,10 +37,6 @@
|
|||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
void flash__init (void);
|
|
||||||
void ether__init (void);
|
|
||||||
void peripheral_power_enable (void);
|
|
||||||
|
|
||||||
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
|
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
|
||||||
void show_boot_progress(int progress)
|
void show_boot_progress(int progress)
|
||||||
{
|
{
|
||||||
@ -82,8 +78,6 @@ int board_init (void)
|
|||||||
|
|
||||||
icache_enable ();
|
icache_enable ();
|
||||||
|
|
||||||
flash__init ();
|
|
||||||
ether__init ();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,22 +88,6 @@ int misc_init_r (void)
|
|||||||
return (0);
|
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:
|
Routine:
|
||||||
Description:
|
Description:
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/mx31-regs.h>
|
#include <asm/arch/mx31-regs.h>
|
||||||
|
#include <div64.h>
|
||||||
|
|
||||||
#define TIMER_BASE 0x53f90000 /* General purpose timer 1 */
|
#define TIMER_BASE 0x53f90000 /* General purpose timer 1 */
|
||||||
|
|
||||||
@ -38,24 +39,55 @@
|
|||||||
#define GPTCR_CLKSOURCE_32 (4 << 6) /* Clock source */
|
#define GPTCR_CLKSOURCE_32 (4 << 6) /* Clock source */
|
||||||
#define GPTCR_TEN 1 /* Timer enable */
|
#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 */
|
/* "time" is measured in 1 / CONFIG_SYS_HZ seconds, "tick" is internal timer period */
|
||||||
#ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
|
#ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
|
||||||
/* ~0.4% error - measured with stop-watch on 100s boot-delay */
|
/* ~0.4% error - measured with stop-watch on 100s boot-delay */
|
||||||
#define TICK_TO_TIME(t) ((t) * CONFIG_SYS_HZ / CONFIG_MX31_CLK32)
|
static inline unsigned long long tick_to_time(unsigned long long tick)
|
||||||
#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 + \
|
tick *= CONFIG_SYS_HZ;
|
||||||
999999) / 1000000)
|
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
|
#else
|
||||||
/* ~2% error */
|
/* ~2% error */
|
||||||
#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
|
#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
|
||||||
#define US_PER_TICK (1000000 / CONFIG_MX31_CLK32)
|
#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 inline unsigned long long tick_to_time(unsigned long long tick)
|
||||||
static ulong lastinc;
|
{
|
||||||
|
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. */
|
/* nothing really to do with interrupts, just starts up a counter. */
|
||||||
/* The 32768Hz 32-bit timer overruns in 131072 seconds */
|
/* 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^9 days... and get_ticks() * CONFIG_SYS_HZ wraps in
|
||||||
* 5 * 10^6 days - long enough.
|
* 5 * 10^6 days - long enough.
|
||||||
*/
|
*/
|
||||||
return TICK_TO_TIME(get_ticks());
|
return tick_to_time(get_ticks());
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong get_timer (ulong base)
|
ulong get_timer (ulong base)
|
||||||
@ -117,7 +149,7 @@ ulong get_timer (ulong base)
|
|||||||
|
|
||||||
void set_timer (ulong t)
|
void set_timer (ulong t)
|
||||||
{
|
{
|
||||||
timestamp = TIME_TO_TICK(t);
|
timestamp = time_to_tick(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* delay x useconds AND perserve advance timstamp value */
|
/* delay x useconds AND perserve advance timstamp value */
|
||||||
@ -126,7 +158,7 @@ void udelay (unsigned long usec)
|
|||||||
unsigned long long tmp;
|
unsigned long long tmp;
|
||||||
ulong tmo;
|
ulong tmo;
|
||||||
|
|
||||||
tmo = US_TO_TICK(usec);
|
tmo = us_to_tick(usec);
|
||||||
tmp = get_ticks() + tmo; /* get current timestamp */
|
tmp = get_ticks() + tmo; /* get current timestamp */
|
||||||
|
|
||||||
while (get_ticks() < tmp) /* loop till event */
|
while (get_ticks() < tmp) /* loop till event */
|
||||||
|
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
|
|||||||
LIB = $(obj)lib$(CPU).a
|
LIB = $(obj)lib$(CPU).a
|
||||||
|
|
||||||
START = start.o
|
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)
|
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
|
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
|
||||||
|
@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
|
|||||||
|
|
||||||
LIB = $(obj)lib$(SOC).a
|
LIB = $(obj)lib$(SOC).a
|
||||||
|
|
||||||
COBJS = timer.o
|
COBJS = timer.o cpuinfo.o
|
||||||
SOBJS = reset.o
|
SOBJS = reset.o
|
||||||
|
|
||||||
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
|
Loading…
Reference in New Issue
Block a user