Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
55aea84b
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
55aea84b
编写于
10月 22, 2013
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-sh
上级
748bde60
7f2013d4
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
67 addition
and
12 deletion
+67
-12
arch/sh/cpu/sh4/cache.c
arch/sh/cpu/sh4/cache.c
+2
-2
arch/sh/cpu/sh4/cpu.c
arch/sh/cpu/sh4/cpu.c
+1
-1
arch/sh/include/asm/cache.h
arch/sh/include/asm/cache.h
+0
-3
arch/sh/lib/time.c
arch/sh/lib/time.c
+6
-4
drivers/serial/serial_sh.c
drivers/serial/serial_sh.c
+4
-1
drivers/serial/serial_sh.h
drivers/serial/serial_sh.h
+13
-0
include/configs/MigoR.h
include/configs/MigoR.h
+2
-0
include/configs/ap325rxa.h
include/configs/ap325rxa.h
+2
-0
include/configs/ap_sh4a_4a.h
include/configs/ap_sh4a_4a.h
+2
-0
include/configs/ecovec.h
include/configs/ecovec.h
+2
-0
include/configs/espt.h
include/configs/espt.h
+2
-0
include/configs/mpr2.h
include/configs/mpr2.h
+2
-0
include/configs/ms7720se.h
include/configs/ms7720se.h
+2
-0
include/configs/ms7722se.h
include/configs/ms7722se.h
+2
-0
include/configs/ms7750se.h
include/configs/ms7750se.h
+2
-0
include/configs/r0p7734.h
include/configs/r0p7734.h
+2
-0
include/configs/r2dplus.h
include/configs/r2dplus.h
+2
-0
include/configs/r7780mp.h
include/configs/r7780mp.h
+2
-0
include/configs/rsk7203.h
include/configs/rsk7203.h
+2
-0
include/configs/rsk7264.h
include/configs/rsk7264.h
+2
-0
include/configs/rsk7269.h
include/configs/rsk7269.h
+2
-0
include/configs/sh7752evb.h
include/configs/sh7752evb.h
+2
-0
include/configs/sh7757lcr.h
include/configs/sh7757lcr.h
+2
-0
include/configs/sh7763rdp.h
include/configs/sh7763rdp.h
+2
-0
include/configs/sh7785lcr.h
include/configs/sh7785lcr.h
+2
-0
include/configs/shmin.h
include/configs/shmin.h
+2
-0
include/sh_tmu.h
include/sh_tmu.h
+1
-1
未找到文件。
arch/sh/cpu/sh4/cache.c
浏览文件 @
55aea84b
...
...
@@ -91,7 +91,7 @@ int cache_control(unsigned int cmd)
return
0
;
}
void
dcache_wback_range
(
u32
start
,
u32
end
)
void
flush_dcache_range
(
unsigned
long
start
,
unsigned
long
end
)
{
u32
v
;
...
...
@@ -102,7 +102,7 @@ void dcache_wback_range(u32 start, u32 end)
}
}
void
dcache_invalid_range
(
u32
start
,
u32
end
)
void
invalidate_dcache_range
(
unsigned
long
start
,
unsigned
long
end
)
{
u32
v
;
...
...
arch/sh/cpu/sh4/cpu.c
浏览文件 @
55aea84b
...
...
@@ -41,7 +41,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
void
flush_cache
(
unsigned
long
addr
,
unsigned
long
size
)
{
dcache_invalid_range
(
addr
,
addr
+
size
);
invalidate_dcache_range
(
addr
,
addr
+
size
);
}
void
icache_enable
(
void
)
...
...
arch/sh/include/asm/cache.h
浏览文件 @
55aea84b
...
...
@@ -10,9 +10,6 @@ int cache_control(unsigned int cmd);
struct
__large_struct
{
unsigned
long
buf
[
100
];
};
#define __m(x) (*(struct __large_struct *)(x))
void
dcache_wback_range
(
u32
start
,
u32
end
);
void
dcache_invalid_range
(
u32
start
,
u32
end
);
#else
/*
...
...
arch/sh/lib/time.c
浏览文件 @
55aea84b
...
...
@@ -17,15 +17,17 @@
#include <asm/io.h>
#include <sh_tmu.h>
#define TCR_TPSC 0x07
static
struct
tmu_regs
*
tmu
=
(
struct
tmu_regs
*
)
TMU_BASE
;
static
u16
bit
;
static
unsigned
long
last_tcnt
;
static
unsigned
long
long
overflow_ticks
;
unsigned
long
get_tbclk
(
void
)
{
return
get_tmu0_clk_rate
()
>>
((
bit
+
1
)
*
2
);
u16
tmu_bit
=
(
ffs
(
CONFIG_SYS_TMU_CLK_DIV
)
>>
1
)
-
1
;
return
get_tmu0_clk_rate
()
>>
((
tmu_bit
+
1
)
*
2
);
}
static
inline
unsigned
long
long
tick_to_time
(
unsigned
long
long
tick
)
...
...
@@ -60,8 +62,8 @@ static void tmu_timer_stop(unsigned int timer)
int
timer_init
(
void
)
{
bit
=
(
ffs
(
CONFIG_SYS_TMU_CLK_DIV
)
>>
1
)
-
1
;
writew
(
readw
(
&
tmu
->
tcr0
)
|
bit
,
&
tmu
->
tcr0
);
u16
tmu_
bit
=
(
ffs
(
CONFIG_SYS_TMU_CLK_DIV
)
>>
1
)
-
1
;
writew
(
(
readw
(
&
tmu
->
tcr0
)
&
~
TCR_TPSC
)
|
tmu_
bit
,
&
tmu
->
tcr0
);
tmu_timer_stop
(
0
);
tmu_timer_start
(
0
);
...
...
drivers/serial/serial_sh.c
浏览文件 @
55aea84b
/*
* SuperH SCIF device driver.
* Copyright (C) 2013 Renesas Electronics Corporation
* Copyright (C) 2007,2008,2010 Nobuhiro Iwamatsu
* Copyright (C) 2002 - 2008 Paul Mundt
*
...
...
@@ -48,7 +49,9 @@ static struct uart_port sh_sci = {
static
void
sh_serial_setbrg
(
void
)
{
DECLARE_GLOBAL_DATA_PTR
;
sci_out
(
&
sh_sci
,
SCBRR
,
SCBRR_VALUE
(
gd
->
baudrate
,
CONFIG_SYS_CLK_FREQ
));
sci_out
(
&
sh_sci
,
SCBRR
,
SCBRR_VALUE
(
gd
->
baudrate
,
CONFIG_SH_SCIF_CLK_FREQ
));
}
static
int
sh_serial_init
(
void
)
...
...
drivers/serial/serial_sh.h
浏览文件 @
55aea84b
...
...
@@ -224,6 +224,9 @@ struct uart_port {
# define SCSPTR3 0xffc60020
/* 16 bit SCIF */
# define SCIF_ORER 0x0001
/* Overrun error bit */
# define SCSCR_INIT(port) 0x38
/* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791)
# define SCIF_ORER 0x0001
# define SCSCR_INIT(port) 0x32
/* TIE=0,RIE=0,TE=1,RE=1,REIE=0, */
#else
# error CPU subtype not defined
#endif
...
...
@@ -298,6 +301,9 @@ struct uart_port {
/* SH7763 SCIF2 support */
# define SCIF2_RFDC_MASK 0x001f
# define SCIF2_TXROOM_MAX 16
#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791)
# define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
# define SCIF_RFDC_MASK 0x003f
#else
# define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
# define SCIF_RFDC_MASK 0x001f
...
...
@@ -579,6 +585,10 @@ SCIF_FNS(SCSPTR, 0, 0, 0, 0)
#else
SCIF_FNS
(
SCSPTR
,
0
,
0
,
0x20
,
16
)
#endif
#if defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791)
SCIF_FNS
(
DL
,
0
,
0
,
0x30
,
16
)
SCIF_FNS
(
CKS
,
0
,
0
,
0x34
,
16
)
#endif
SCIF_FNS
(
SCLSR
,
0
,
0
,
0x24
,
16
)
#endif
#endif
...
...
@@ -720,6 +730,9 @@ static inline int scbrr_calc(struct uart_port port, int bps, int clk)
#define SCBRR_VALUE(bps, clk) scbrr_calc(sh_sci, bps, clk)
#elif defined(__H8300H__) || defined(__H8300S__)
#define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1)
#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791)
#define SCBRR DL
#define SCBRR_VALUE(bps, clk) (clk / bps / 16)
#else
/* Generic SH */
#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1)
#endif
include/configs/MigoR.h
浏览文件 @
55aea84b
...
...
@@ -123,6 +123,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV (4)
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ap325rxa.h
浏览文件 @
55aea84b
...
...
@@ -155,6 +155,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV (4)
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ap_sh4a_4a.h
浏览文件 @
55aea84b
...
...
@@ -158,6 +158,8 @@
#else
#define CONFIG_SYS_CLK_FREQ 44444444
#endif
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ecovec.h
浏览文件 @
55aea84b
...
...
@@ -179,6 +179,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 41666666
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/espt.h
浏览文件 @
55aea84b
...
...
@@ -98,6 +98,8 @@
/* Clock */
#define CONFIG_SYS_CLK_FREQ 66666666
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/mpr2.h
浏览文件 @
55aea84b
...
...
@@ -67,6 +67,8 @@
/* Clocks */
#define CONFIG_SYS_CLK_FREQ 24000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ms7720se.h
浏览文件 @
55aea84b
...
...
@@ -85,6 +85,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ms7722se.h
浏览文件 @
55aea84b
...
...
@@ -111,6 +111,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV (4)
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/ms7750se.h
浏览文件 @
55aea84b
...
...
@@ -82,6 +82,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/r0p7734.h
浏览文件 @
55aea84b
...
...
@@ -164,6 +164,8 @@
#else
#define CONFIG_SYS_CLK_FREQ 44444444
#endif
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/r2dplus.h
浏览文件 @
55aea84b
...
...
@@ -77,6 +77,8 @@
* SuperH Clock setting
*/
#define CONFIG_SYS_CLK_FREQ 60000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_PLL_SETTLING_TIME 100
/* in us */
...
...
include/configs/r7780mp.h
浏览文件 @
55aea84b
...
...
@@ -102,6 +102,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/rsk7203.h
浏览文件 @
55aea84b
...
...
@@ -85,6 +85,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CMT_CLK_DIVIDER 32
/* 8 (default), 32, 128 or 512 */
#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
...
...
include/configs/rsk7264.h
浏览文件 @
55aea84b
...
...
@@ -65,6 +65,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 36000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CMT_CLK_DIVIDER 32
/* 8 (default), 32, 128 or 512 */
#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
...
...
include/configs/rsk7269.h
浏览文件 @
55aea84b
...
...
@@ -64,6 +64,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 66125000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CMT_CLK_DIVIDER 32
/* 8 (default), 32, 128 or 512 */
#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
...
...
include/configs/sh7752evb.h
浏览文件 @
55aea84b
...
...
@@ -132,6 +132,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 48000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
#endif
/* __SH7752EVB_H */
include/configs/sh7757lcr.h
浏览文件 @
55aea84b
...
...
@@ -140,6 +140,8 @@
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 48000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
#endif
/* __SH7757LCR_H */
include/configs/sh7763rdp.h
浏览文件 @
55aea84b
...
...
@@ -98,6 +98,8 @@
/* Clock */
#define CONFIG_SYS_CLK_FREQ 66666666
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV (4)
/* 4 (default), 16, 64, 256 or 1024 */
#define CONFIG_SYS_HZ 1000
...
...
include/configs/sh7785lcr.h
浏览文件 @
55aea84b
...
...
@@ -172,6 +172,8 @@
/* Board Clock */
/* The SCIF used external clock. system clock only used timer. */
#define CONFIG_SYS_CLK_FREQ 50000000
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/configs/shmin.h
浏览文件 @
55aea84b
...
...
@@ -103,6 +103,8 @@
#else
#define CONFIG_SYS_CLK_FREQ 33333333
#endif
/* CONFIG_T_SH7706LSR */
#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
#define CONFIG_SYS_TMU_CLK_DIV 4
#define CONFIG_SYS_HZ 1000
...
...
include/sh_tmu.h
浏览文件 @
55aea84b
...
...
@@ -69,7 +69,7 @@ struct tmu_regs {
static
inline
unsigned
long
get_tmu0_clk_rate
(
void
)
{
return
CONFIG_S
YS
_CLK_FREQ
;
return
CONFIG_S
H_TMU
_CLK_FREQ
;
}
#endif
/* __SH_TMU_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录