GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ../custodians

Browse source
This commit is contained in:
Wolfgang Denk 2008-01-23 14:35:32 +01:00
commit b0e49b4cd8
2 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/serial/serial_sh.c
View file

@ -1,6 +1,6 @@
/* /*
* SuperH SCIF device driver. * SuperH SCIF device driver.
* Copyright (c) 2007 Nobuhiro Iwamatsu * Copyright (c) 2007,2008 Nobuhiro Iwamatsu
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -36,7 +36,7 @@
#define SCSCR (vu_short *)(SCIF_BASE + 0x8) #define SCSCR (vu_short *)(SCIF_BASE + 0x8)
#define SCFCR (vu_short *)(SCIF_BASE + 0x18) #define SCFCR (vu_short *)(SCIF_BASE + 0x18)
#define SCFDR (vu_short *)(SCIF_BASE + 0x1C) #define SCFDR (vu_short *)(SCIF_BASE + 0x1C)
#ifdef CONFIG_SH7720 /* SH7720 specific */ #ifdef CONFIG_CPU_SH7720 /* SH7720 specific */
#define SCFSR (vu_short *)(SCIF_BASE + 0x14) /* SCSSR */ #define SCFSR (vu_short *)(SCIF_BASE + 0x14) /* SCSSR */
#define SCFTDR (vu_char *)(SCIF_BASE + 0x20) #define SCFTDR (vu_char *)(SCIF_BASE + 0x20)
#define SCFRDR (vu_char *)(SCIF_BASE + 0x24) #define SCFRDR (vu_char *)(SCIF_BASE + 0x24)
@ -57,12 +57,19 @@
#define SCLSR (vu_short *)(SCIF_BASE + 0x24) #define SCLSR (vu_short *)(SCIF_BASE + 0x24)
#define LSR_ORER 1 #define LSR_ORER 1
#elif defined (CONFIG_SH3) #elif defined (CONFIG_SH3)
#ifdef CONFIG_SH7720 /* SH7720 specific */ #ifdef CONFIG_CPU_SH7720 /* SH7720 specific */
# define SCLSR SCFSR /* SCSSR */ #define SCLSR (vu_short *)(SCIF_BASE + 0x24)
#else
# define SCLSR (vu_short *)(SCIF_BASE + 0x24)
#endif
#define LSR_ORER 0x0200 #define LSR_ORER 0x0200
#else
#define SCLSR SCFSR /* SCSSR */
#define LSR_ORER 1
#endif
#endif
#if defined(CONFIG_CPU_SH7720)
#define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1)
#else /* Generic SuperH */
#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1)
#endif #endif
#define SCR_RE (1 << 4) #define SCR_RE (1 << 4)
@ -82,18 +89,7 @@
void serial_setbrg (void) void serial_setbrg (void)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
*SCBRR = SCBRR_VALUE(gd->baudrate,CONFIG_SYS_CLK_FREQ);
#if defined(CONFIG_CPU_SH7720)
int divisor = gd->baudrate * 16;
*SCBRR = (CONFIG_SYS_CLK_FREQ * 2 + (divisor / 2)) /
(gd->baudrate * 32) - 1;
#else
int divisor = gd->baudrate * 32;
*SCBRR = (CONFIG_SYS_CLK_FREQ + (divisor / 2)) /
(gd->baudrate * 32) - 1;
#endif
} }
int serial_init (void) int serial_init (void)

7
include/configs/ms7720se.h
View file

@ -40,13 +40,6 @@
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2
#define CFG_CMD_PCMCIA 0x01
#define CFG_CMD_IDE 0x02
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \
CFG_CMD_IDE|CFG_CMD_PCMCIA) & \
~(CFG_CMD_FPGA))
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTARGS "console=ttySC0,115200"
#define CONFIG_BOOTFILE /boot/zImage #define CONFIG_BOOTFILE /boot/zImage