mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 14:10:43 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-arc
This commit is contained in:
commit
5fee9489f6
4 changed files with 5 additions and 23 deletions
|
@ -9,7 +9,6 @@
|
|||
|
||||
/* Architecture-specific global data */
|
||||
struct arch_global_data {
|
||||
int running_on_hw;
|
||||
};
|
||||
|
||||
#include <asm-generic/global_data.h>
|
||||
|
|
|
@ -239,4 +239,9 @@ static inline int __raw_writesl(unsigned int addr, void *data, int longlen)
|
|||
#define setbits_8(addr, set) setbits(8, addr, set)
|
||||
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
|
||||
|
||||
static inline phys_addr_t virt_to_phys(void *vaddr)
|
||||
{
|
||||
return (phys_addr_t)((unsigned long)vaddr);
|
||||
}
|
||||
|
||||
#endif /* __ASM_ARC_IO_H */
|
||||
|
|
|
@ -14,12 +14,6 @@ int arch_cpu_init(void)
|
|||
{
|
||||
timer_init();
|
||||
|
||||
/* In simulation (ISS) "CHIPID" and "ARCNUM" are all "ff" */
|
||||
if ((read_aux_reg(ARC_AUX_IDENTITY) & 0xffffff00) == 0xffffff00)
|
||||
gd->arch.running_on_hw = 0;
|
||||
else
|
||||
gd->arch.running_on_hw = 1;
|
||||
|
||||
gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
|
||||
|
|
|
@ -42,23 +42,7 @@ static int arc_serial_setbrg(struct udevice *dev, int baudrate)
|
|||
int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1;
|
||||
|
||||
writeb(arc_console_baud & 0xff, ®s->baudl);
|
||||
|
||||
#ifdef CONFIG_ARC
|
||||
/*
|
||||
* UART ISS(Instruction Set simulator) emulation has a subtle bug:
|
||||
* A existing value of Baudh = 0 is used as a indication to startup
|
||||
* it's internal state machine.
|
||||
* Thus if baudh is set to 0, 2 times, it chokes.
|
||||
* This happens with BAUD=115200 and the formaula above
|
||||
* Until that is fixed, when running on ISS, we will set baudh to !0
|
||||
*/
|
||||
if (gd->arch.running_on_hw)
|
||||
writeb((arc_console_baud & 0xff00) >> 8, ®s->baudh);
|
||||
else
|
||||
writeb(1, ®s->baudh);
|
||||
#else
|
||||
writeb((arc_console_baud & 0xff00) >> 8, ®s->baudh);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue