Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-01-10 12:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Minkyu Kang 2010-02-08 12:13:35 +09:00
commit f687ebf82d
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/edb93xx/early_udelay.h
View file

@ -26,7 +26,7 @@
static inline void early_udelay(uint32_t usecs) static inline void early_udelay(uint32_t usecs)
{ {
/* loop takes 4 cycles at 5.0ns (fastest case, running at 200MHz) */ /* loop takes 4 cycles at 5.0ns (fastest case, running at 200MHz) */
register uint32_t loops = (usecs * 1000) / 20; register uint32_t loops = usecs * (1000 / 20);
__asm__ volatile ("1:\n" __asm__ volatile ("1:\n"
"subs %0, %1, #1\n" "subs %0, %1, #1\n"

6
board/edb93xx/edb93xx.c
View file

@ -64,6 +64,12 @@ int board_init(void)
value |= SYSCON_PWRCNT_UART_BAUD; value |= SYSCON_PWRCNT_UART_BAUD;
writel(value, &syscon->pwrcnt); writel(value, &syscon->pwrcnt);
/* Enable the uart in devicecfg */
value = readl(&syscon->devicecfg);
value |= 1<<18 /* U1EN */;
writel(0xAA, &syscon->sysswlock);
writel(value, &syscon->devicecfg);
/* Machine number, as defined in linux/arch/arm/tools/mach-types */ /* Machine number, as defined in linux/arch/arm/tools/mach-types */
gd->bd->bi_arch_number = CONFIG_MACH_TYPE; gd->bd->bi_arch_number = CONFIG_MACH_TYPE;

3
include/asm-arm/arch-ep93xx/ep93xx.h
View file

@ -558,8 +558,9 @@ struct syscon_regs {
uint32_t i2sclkdiv; uint32_t i2sclkdiv;
uint32_t keytchclkdiv; uint32_t keytchclkdiv;
uint32_t chipid; uint32_t chipid;
uint32_t reserved4;
uint32_t syscfg; uint32_t syscfg;
uint32_t reserved4[8]; uint32_t reserved5[8];
uint32_t sysswlock; uint32_t sysswlock;
}; };
#else #else