Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
977b50f8
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,发现更多精彩内容 >>
提交
977b50f8
编写于
5月 10, 2006
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor cleanup.
上级
278bc4b3
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
36 addition
and
37 deletion
+36
-37
CHANGELOG
CHANGELOG
+2
-0
board/m5271evb/m5271evb.c
board/m5271evb/m5271evb.c
+3
-4
board/r5200/r5200.c
board/r5200/r5200.c
+2
-3
cpu/arm926ejs/cpuinfo.c
cpu/arm926ejs/cpuinfo.c
+0
-1
cpu/mcf52x2/cpu_init.c
cpu/mcf52x2/cpu_init.c
+25
-25
cpu/mcf52x2/serial.c
cpu/mcf52x2/serial.c
+1
-1
include/configs/MPC8349EMDS.h
include/configs/MPC8349EMDS.h
+1
-1
include/configs/r5200.h
include/configs/r5200.h
+1
-1
lib_m68k/board.c
lib_m68k/board.c
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
977b50f8
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4:
Changes since U-Boot 1.1.4:
======================================================================
======================================================================
* Minor cleanup.
* Update yosemite configuration to enable flash write buffer support
* Update yosemite configuration to enable flash write buffer support
Patch by Stefan Roese, 10 May 2006
Patch by Stefan Roese, 10 May 2006
...
...
board/m5271evb/m5271evb.c
浏览文件 @
977b50f8
...
@@ -53,10 +53,9 @@ long int initdram (int board_type) {
...
@@ -53,10 +53,9 @@ long int initdram (int board_type) {
* Check to see if the SDRAM has already been initialized
* Check to see if the SDRAM has already been initialized
* by a run control tool
* by a run control tool
*/
*/
if
(
!
(
mbar_readLong
(
MCF_SDRAMC_DACR0
)
&
MCF_SDRAMC_DACRn_RE
))
if
(
!
(
mbar_readLong
(
MCF_SDRAMC_DACR0
)
&
MCF_SDRAMC_DACRn_RE
))
{
{
/* Initialize DRAM Control Register: DCR */
/* Initialize DRAM Control Register: DCR */
mbar_writeShort
(
MCF_SDRAMC_DCR
,
mbar_writeShort
(
MCF_SDRAMC_DCR
,
MCF_SDRAMC_DCR_RTIM
(
0x01
)
MCF_SDRAMC_DCR_RTIM
(
0x01
)
|
MCF_SDRAMC_DCR_RC
(
0x30
));
|
MCF_SDRAMC_DCR_RC
(
0x30
));
...
@@ -74,7 +73,7 @@ long int initdram (int board_type) {
...
@@ -74,7 +73,7 @@ long int initdram (int board_type) {
|
MCF_SDRAMC_DACRn_PS
(
0
));
|
MCF_SDRAMC_DACRn_PS
(
0
));
/* Initialize DMR0 */
/* Initialize DMR0 */
mbar_writeLong
(
MCF_SDRAMC_DMR0
,
mbar_writeLong
(
MCF_SDRAMC_DMR0
,
MCF_SDRAMC_DMRn_BAM_16M
MCF_SDRAMC_DMRn_BAM_16M
|
MCF_SDRAMC_DMRn_V
);
|
MCF_SDRAMC_DMRn_V
);
...
...
board/r5200/r5200.c
浏览文件 @
977b50f8
...
@@ -47,8 +47,7 @@ long int initdram (int board_type) {
...
@@ -47,8 +47,7 @@ long int initdram (int board_type) {
* Check to see if the SDRAM has already been initialized
* Check to see if the SDRAM has already been initialized
* by a run control tool
* by a run control tool
*/
*/
if
(
!
(
mbar_readLong
(
MCF_SDRAMC_DACR0
)
&
MCF_SDRAMC_DACRn_RE
))
if
(
!
(
mbar_readLong
(
MCF_SDRAMC_DACR0
)
&
MCF_SDRAMC_DACRn_RE
))
{
{
/*
/*
* Initialize DRAM Control Register: DCR
* Initialize DRAM Control Register: DCR
*/
*/
...
@@ -67,7 +66,7 @@ long int initdram (int board_type) {
...
@@ -67,7 +66,7 @@ long int initdram (int board_type) {
/*
/*
* Initialize DMR0
* Initialize DMR0
*/
*/
mbar_writeLong
(
MCF_SDRAMC_DMR0
,
mbar_writeLong
(
MCF_SDRAMC_DMR0
,
MCF_SDRAMC_DMRn_BAM_8M
MCF_SDRAMC_DMRn_BAM_8M
|
MCF_SDRAMC_DMRn_V
);
|
MCF_SDRAMC_DMRn_V
);
...
...
cpu/arm926ejs/cpuinfo.c
浏览文件 @
977b50f8
...
@@ -242,4 +242,3 @@ int print_cpuinfo (void)
...
@@ -242,4 +242,3 @@ int print_cpuinfo (void)
}
}
#endif
/* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */
#endif
/* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */
cpu/mcf52x2/cpu_init.c
浏览文件 @
977b50f8
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
*
*
* This program is distributed in the hope that it will be useful,
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
* GNU General Public License for more details.
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License
...
@@ -58,9 +58,9 @@ void cpu_init_f (void)
...
@@ -58,9 +58,9 @@ void cpu_init_f (void)
/* Enable UART pins */
/* Enable UART pins */
mbar_writeShort
(
MCF_GPIO_PAR_UART
,
MCF_GPIO_PAR_UART_U0TXD
|
mbar_writeShort
(
MCF_GPIO_PAR_UART
,
MCF_GPIO_PAR_UART_U0TXD
|
MCF_GPIO_PAR_UART_U0RXD
|
MCF_GPIO_PAR_UART_U0RXD
|
MCF_GPIO_PAR_UART_U1RXD_UART1
|
MCF_GPIO_PAR_UART_U1RXD_UART1
|
MCF_GPIO_PAR_UART_U1TXD_UART1
);
MCF_GPIO_PAR_UART_U1TXD_UART1
);
/* Enable Ethernet pins */
/* Enable Ethernet pins */
mbar_writeByte
(
MCF_GPIO_PAR_FECI2C
,
CFG_FECI2C
);
mbar_writeByte
(
MCF_GPIO_PAR_FECI2C
,
CFG_FECI2C
);
...
@@ -69,7 +69,7 @@ void cpu_init_f (void)
...
@@ -69,7 +69,7 @@ void cpu_init_f (void)
/*
/*
* initialize higher level parts of CPU like timers
* initialize higher level parts of CPU like timers
*/
*/
int
cpu_init_r
(
void
)
int
cpu_init_r
(
void
)
{
{
return
(
0
);
return
(
0
);
}
}
...
@@ -97,7 +97,7 @@ void cpu_init_f (void)
...
@@ -97,7 +97,7 @@ void cpu_init_f (void)
regp
->
sysctrl_reg
.
sc_scr
=
CFG_SCR
;
regp
->
sysctrl_reg
.
sc_scr
=
CFG_SCR
;
regp
->
sysctrl_reg
.
sc_spr
=
CFG_SPR
;
regp
->
sysctrl_reg
.
sc_spr
=
CFG_SPR
;
/* Setup Ports:
*/
/* Setup Ports:
*/
regp
->
gpio_reg
.
gpio_pacnt
=
CFG_PACNT
;
regp
->
gpio_reg
.
gpio_pacnt
=
CFG_PACNT
;
regp
->
gpio_reg
.
gpio_paddr
=
CFG_PADDR
;
regp
->
gpio_reg
.
gpio_paddr
=
CFG_PADDR
;
regp
->
gpio_reg
.
gpio_padat
=
CFG_PADAT
;
regp
->
gpio_reg
.
gpio_padat
=
CFG_PADAT
;
...
@@ -147,15 +147,15 @@ void cpu_init_f (void)
...
@@ -147,15 +147,15 @@ void cpu_init_f (void)
#endif
/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
#endif
/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
/* enable instruction cache now */
/* enable instruction cache now */
icache_enable
();
icache_enable
();
}
}
/*
/*
* initialize higher level parts of CPU like timers
* initialize higher level parts of CPU like timers
*/
*/
int
cpu_init_r
(
void
)
int
cpu_init_r
(
void
)
{
{
return
(
0
);
return
(
0
);
}
}
...
@@ -178,7 +178,7 @@ void cpu_init_f (void)
...
@@ -178,7 +178,7 @@ void cpu_init_f (void)
/*
/*
* initialize higher level parts of CPU like timers
* initialize higher level parts of CPU like timers
*/
*/
int
cpu_init_r
(
void
)
int
cpu_init_r
(
void
)
{
{
return
(
0
);
return
(
0
);
}
}
...
@@ -202,23 +202,23 @@ void cpu_init_f (void)
...
@@ -202,23 +202,23 @@ void cpu_init_f (void)
volatile
unsigned
long
cpll
=
mbar2_readLong
(
MCFSIM_PLLCR
);
volatile
unsigned
long
cpll
=
mbar2_readLong
(
MCFSIM_PLLCR
);
unsigned
long
pllcr
;
unsigned
long
pllcr
;
#ifdef CFG_FAST_CLK
#ifdef CFG_FAST_CLK
pllcr
=
0x925a3100
;
/* ~140MHz clock (PLL bypass = 0) */
pllcr
=
0x925a3100
;
/* ~140MHz clock (PLL bypass = 0) */
#else
#else
pllcr
=
0x135a4140
;
/* ~72MHz clock (PLL bypass = 0) */
pllcr
=
0x135a4140
;
/* ~72MHz clock (PLL bypass = 0) */
#endif
#endif
cpll
=
cpll
&
0xfffffffe
;
/* Set PLL bypass mode = 0 (PSTCLK = crystal) */
cpll
=
cpll
&
0xfffffffe
;
/* Set PLL bypass mode = 0 (PSTCLK = crystal) */
mbar2_writeLong
(
MCFSIM_PLLCR
,
cpll
);
/* Set the PLL to bypass mode (PSTCLK = crystal) */
mbar2_writeLong
(
MCFSIM_PLLCR
,
cpll
);
/* Set the PLL to bypass mode (PSTCLK = crystal) */
mbar2_writeLong
(
MCFSIM_PLLCR
,
pllcr
);
/* set the clock speed */
mbar2_writeLong
(
MCFSIM_PLLCR
,
pllcr
);
/* set the clock speed */
pllcr
^=
0x00000001
;
/* Set pll bypass to 1 */
pllcr
^=
0x00000001
;
/* Set pll bypass to 1 */
mbar2_writeLong
(
MCFSIM_PLLCR
,
pllcr
);
/* Start locking (pll bypass = 1) */
mbar2_writeLong
(
MCFSIM_PLLCR
,
pllcr
);
/* Start locking (pll bypass = 1) */
udelay
(
0x20
);
/* Wait for a lock ... */
udelay
(
0x20
);
/* Wait for a lock ... */
#endif
/* #ifndef CFG_PLL_BYPASS */
#endif
/* #ifndef CFG_PLL_BYPASS */
/*
/*
* NOTE: by setting the GPIO_FUNCTION registers, we ensure that the UART pins
* NOTE: by setting the GPIO_FUNCTION registers, we ensure that the UART pins
*
(UART0: gpio 30,27, UART1: gpio 31, 28) will be used as UART pins
*
(UART0: gpio 30,27, UART1: gpio 31, 28) will be used as UART pins
*
which is their primary function.
*
which is their primary function.
*
~Jeremy
*
~Jeremy
*/
*/
mbar2_writeLong
(
MCFSIM_GPIO_FUNC
,
CFG_GPIO_FUNC
);
mbar2_writeLong
(
MCFSIM_GPIO_FUNC
,
CFG_GPIO_FUNC
);
mbar2_writeLong
(
MCFSIM_GPIO1_FUNC
,
CFG_GPIO1_FUNC
);
mbar2_writeLong
(
MCFSIM_GPIO1_FUNC
,
CFG_GPIO1_FUNC
);
...
@@ -233,7 +233,7 @@ void cpu_init_f (void)
...
@@ -233,7 +233,7 @@ void cpu_init_f (void)
* (Internal Register Display) command
* (Internal Register Display) command
* ~Jeremy
* ~Jeremy
*
*
*/
*/
mbar_writeByte
(
MCFSIM_MPARK
,
0x30
);
/* 5249 Internal Core takes priority over DMA */
mbar_writeByte
(
MCFSIM_MPARK
,
0x30
);
/* 5249 Internal Core takes priority over DMA */
mbar_writeByte
(
MCFSIM_SYPCR
,
0x00
);
mbar_writeByte
(
MCFSIM_SYPCR
,
0x00
);
mbar_writeByte
(
MCFSIM_SWIVR
,
0x0f
);
mbar_writeByte
(
MCFSIM_SWIVR
,
0x0f
);
...
@@ -252,9 +252,9 @@ void cpu_init_f (void)
...
@@ -252,9 +252,9 @@ void cpu_init_f (void)
mbar_writeByte
(
MCFSIM_QSPIICR
,
0x00
);
mbar_writeByte
(
MCFSIM_QSPIICR
,
0x00
);
mbar2_writeLong
(
MCFSIM_GPIO_INT_EN
,
0x00000080
);
mbar2_writeLong
(
MCFSIM_GPIO_INT_EN
,
0x00000080
);
mbar2_writeByte
(
MCFSIM_INTBASE
,
0x40
);
/* Base interrupts at 64 */
mbar2_writeByte
(
MCFSIM_INTBASE
,
0x40
);
/* Base interrupts at 64 */
mbar2_writeByte
(
MCFSIM_SPURVEC
,
0x00
);
mbar2_writeByte
(
MCFSIM_SPURVEC
,
0x00
);
mbar2_writeLong
(
MCFSIM_IDECONFIG1
,
0x00000020
);
/* Enable a 1 cycle pre-drive cycle on CS1 */
mbar2_writeLong
(
MCFSIM_IDECONFIG1
,
0x00000020
);
/* Enable a 1 cycle pre-drive cycle on CS1 */
/* Setup interrupt priorities for gpio7 */
/* Setup interrupt priorities for gpio7 */
/* mbar2_writeLong(MCFSIM_INTLEV5, 0x70000000); */
/* mbar2_writeLong(MCFSIM_INTLEV5, 0x70000000); */
...
@@ -282,7 +282,7 @@ void cpu_init_f (void)
...
@@ -282,7 +282,7 @@ void cpu_init_f (void)
/*
/*
* initialize higher level parts of CPU like timers
* initialize higher level parts of CPU like timers
*/
*/
int
cpu_init_r
(
void
)
int
cpu_init_r
(
void
)
{
{
return
(
0
);
return
(
0
);
}
}
...
...
cpu/mcf52x2/serial.c
浏览文件 @
977b50f8
...
@@ -106,7 +106,7 @@ void rs_serial_init(int port,int baudrate)
...
@@ -106,7 +106,7 @@ void rs_serial_init(int port,int baudrate)
/* Set clock Select Register: Tx/Rx clock is timer */
/* Set clock Select Register: Tx/Rx clock is timer */
uartp
[
MCFUART_UCSR
]
=
MCFUART_UCSR_RXCLKTIMER
|
MCFUART_UCSR_TXCLKTIMER
;
uartp
[
MCFUART_UCSR
]
=
MCFUART_UCSR_RXCLKTIMER
|
MCFUART_UCSR_TXCLKTIMER
;
rs_serial_setbaudrate
(
port
,
baudrate
);
rs_serial_setbaudrate
(
port
,
baudrate
);
/* Enable Tx/Rx */
/* Enable Tx/Rx */
...
...
include/configs/MPC8349EMDS.h
浏览文件 @
977b50f8
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#define CONFIG_MPC8349 1
/* MPC8349 specific */
#define CONFIG_MPC8349 1
/* MPC8349 specific */
#define CONFIG_MPC8349EMDS 1
/* MPC8349EMDS board specific */
#define CONFIG_MPC8349EMDS 1
/* MPC8349EMDS board specific */
#undef CONFIG_PCI
#undef CONFIG_PCI
#undef CONFIG_MPC83XX_PCI2
/* support for 2nd PCI controller */
#undef CONFIG_MPC83XX_PCI2
/* support for 2nd PCI controller */
#define PCI_66M
#define PCI_66M
...
...
include/configs/r5200.h
浏览文件 @
977b50f8
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
#include <cmd_confdefs.h>
#include <cmd_confdefs.h>
/* Note: We only copy one sectors worth of application code from location
/* Note: We only copy one sectors worth of application code from location
* 10200000 for speed purposes. Increase the size if necessary */
* 10200000 for speed purposes. Increase the size if necessary */
#define CONFIG_BOOTCOMMAND "cp.b 10200000 0 20000; go 400"
#define CONFIG_BOOTCOMMAND "cp.b 10200000 0 20000; go 400"
#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTDELAY 1
...
...
lib_m68k/board.c
浏览文件 @
977b50f8
...
@@ -363,7 +363,7 @@ board_init_f (ulong bootflag)
...
@@ -363,7 +363,7 @@ board_init_f (ulong bootflag)
*
paddr
--
=
0
;
*
paddr
--
=
0
;
*
paddr
--
=
0
;
*
paddr
--
=
0
;
addr_sp
=
(
ulong
)
paddr
;
addr_sp
=
(
ulong
)
paddr
;
debug
(
"Stack Pointer at: %08lx
\n
"
,
addr_sp
);
debug
(
"Stack Pointer at: %08lx
\n
"
,
addr_sp
);
/*
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录