Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8ff0208d
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,发现更多精彩内容 >>
提交
8ff0208d
编写于
3月 12, 2006
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Switch MPC86xADS and MPC885ADS boards to use cpuclk environment
variable to set clock Patch by Yuli Barcohen, 05 Jun 2005
上级
f47b6611
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
85 addition
and
117 deletion
+85
-117
CHANGELOG
CHANGELOG
+4
-0
board/fads/fads.c
board/fads/fads.c
+12
-16
board/fads/fads.h
board/fads/fads.h
+55
-80
include/configs/MPC86xADS.h
include/configs/MPC86xADS.h
+5
-2
include/configs/MPC885ADS.h
include/configs/MPC885ADS.h
+9
-19
未找到文件。
CHANGELOG
浏览文件 @
8ff0208d
...
...
@@ -2,6 +2,10 @@
Changes since U-Boot 1.1.4:
======================================================================
* Switch MPC86xADS and MPC885ADS boards to use cpuclk environment
variable to set clock
Patch by Yuli Barcohen, 05 Jun 2005
* RPXlite configuration fixes
- Use correct flash sector size
- Use correct memory test end address
...
...
board/fads/fads.c
浏览文件 @
8ff0208d
...
...
@@ -726,24 +726,23 @@ static void checkdboard(void)
int
checkboard
(
void
)
{
/* get revision from BCSR 3 */
#if defined(CONFIG_MPC86xADS)
puts
(
"Board: MPC86xADS
\n
"
);
#elif defined(CONFIG_MPC885ADS)
puts
(
"Board: MPC885ADS
\n
"
);
#else
/* Only old ADS/FADS have got revision ID in BCSR3 */
uint
r
=
(((
*
((
uint
*
)
BCSR3
)
>>
23
)
&
1
)
<<
3
)
|
(((
*
((
uint
*
)
BCSR3
)
>>
19
)
&
1
)
<<
2
)
|
(((
*
((
uint
*
)
BCSR3
)
>>
16
)
&
3
));
puts
(
"Board: "
);
#if defined(CONFIG_MPC86xADS)
puts
(
"MPC86xADS"
);
#elif defined(CONFIG_MPC885ADS)
puts
(
"MPC885ADS"
);
r
=
0
;
/* I've got NR (No Revision) board */
#elif defined(CONFIG_FADS)
#if defined(CONFIG_FADS)
puts
(
"FADS"
);
checkdboard
();
#else
puts
(
"ADS"
);
#endif
puts
(
" rev "
);
switch
(
r
)
{
...
...
@@ -758,13 +757,9 @@ int checkboard (void)
puts
(
"A - warning, read errata
\n
"
);
break
;
case
0x03
:
puts
(
"B
\n
"
);
puts
(
"B
\n
"
);
break
;
#elif defined(CONFIG_MPC885ADS)
case
0x00
:
puts
(
"NR
\n
"
);
break
;
#else
/* FADS and newer */
#else
/* FADS */
case
0x00
:
puts
(
"ENG
\n
"
);
break
;
...
...
@@ -776,6 +771,7 @@ int checkboard (void)
printf
(
"unknown (0x%x)
\n
"
,
r
);
return
-
1
;
}
#endif
/* CONFIG_MPC86xADS */
return
0
;
}
...
...
@@ -848,7 +844,7 @@ int pcmcia_init(void)
switch
((
pcmp
->
pcmc_pipr
>>
14
)
&
3
)
#endif
{
case
0x0
0
:
case
0x0
3
:
printf
(
"5V"
);
v
=
5
;
break
;
...
...
@@ -860,7 +856,7 @@ int pcmcia_init(void)
v
=
5
;
#endif
break
;
case
0x0
3
:
case
0x0
0
:
printf
(
"5V, 3V and x.xV"
);
#ifdef CONFIG_FADS
v
=
3
;
/* User lower voltage if supported! */
...
...
board/fads/fads.h
浏览文件 @
8ff0208d
...
...
@@ -55,18 +55,26 @@
#define CONFIG_BOOTDELAY 5
/* autoboot after 5 seconds */
#endif
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
#define CONFIG_ENV_OVERWRITE
#define CONFIG_NFSBOOTCOMMAND \
"dhcp;" \
"setenv bootargs root=/dev/nfs rw nfsroot=$
{serverip}:${rootpath} "
\
"ip=$
{ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"
\
"setenv bootargs root=/dev/nfs rw nfsroot=$
rootpath "
\
"ip=$
ipaddr:$serverip:$gatewayip:$netmask:$hostname:eth0:off;"
\
"bootm"
#define CONFIG_BOOTCOMMAND \
"setenv bootargs root=/dev/mtdblock2 rw mtdparts=phys:1280K(ROM)ro,-(root) "\
"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:eth0:off;" \
"bootm fe080000"
#undef CONFIG_BOOTARGS
#undef CONFIG_WATCHDOG
/* watchdog disabled */
#define CONFIG_BZIP2
/* include support for bzip2 compressed images */
/*
* New MPC86xADS and
Duet
provide two Ethernet connectivity options:
* New MPC86xADS and
MPC885ADS
provide two Ethernet connectivity options:
* 10Mbit/s on SCC and 100Mbit/s on FEC. FADS provides SCC Ethernet on
* motherboard and FEC Ethernet on daughterboard. All new PQ1 chips have
* got FEC so FEC is the default.
...
...
@@ -89,7 +97,9 @@
#ifndef CONFIG_COMMANDS
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_ASKENV \
| CFG_CMD_DHCP \
| CFG_CMD_ECHO \
| CFG_CMD_IMMAP \
| CFG_CMD_JFFS2 \
| CFG_CMD_MII \
...
...
@@ -104,16 +114,18 @@
/*
* Miscellaneous configurable options
*/
#undef CFG_LONGHELP
/* undef to save memory */
#define CFG_PROMPT "=>"
/* Monitor Command Prompt */
#define CFG_PROMPT "=>"
/* Monitor Command Prompt */
#define CFG_HUSH_PARSER
#define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_LONGHELP
/* #undef to save memory */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CFG_CBSIZE 1024
/* Console I/O Buffer Size */
#define CFG_CBSIZE
1024
/* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256
/* Console I/O Buffer Size */
#define CFG_CBSIZE
256
/* Console I/O Buffer Size */
#endif
#define CFG_PBSIZE (CFG_CBSIZE
+sizeof(CFG_PROMPT)+16)
/* Print Buffer Size
*/
#define CFG_MAXARGS 16
/* max number of command args */
#define CFG_BARGSIZE CFG_CBSIZE
/* Boot Argument Buffer Size */
#define CFG_PBSIZE (CFG_CBSIZE
+ sizeof(CFG_PROMPT) + 16)
/* Print Buffer Size
*/
#define CFG_MAXARGS
16
/* max number of command args */
#define CFG_BARGSIZE
CFG_CBSIZE
/* Boot Argument Buffer Size */
#define CFG_LOAD_ADDR 0x00100000
...
...
@@ -126,6 +138,7 @@
* (address mappings, register initial values, etc.)
* You should know what you are doing if you make changes here.
*/
/*-----------------------------------------------------------------------
* Internal Memory Mapped Register
*/
...
...
@@ -148,6 +161,14 @@
#define CFG_SDRAM_BASE 0x00000000
#if defined(CONFIG_MPC86xADS) || defined(CONFIG_MPC885ADS)
/* New ADS or Duet */
#define CFG_SDRAM_SIZE 0x00800000
/* 8 Mbyte */
/*
* 2048 SDRAM rows
* 1000 factor s -> ms
* 64 PTP (pre-divider from MPTPR) from SDRAM example configuration
* 4 Number of refresh cycles per period
* 64 Refresh cycle in ms per number of rows
*/
#define CFG_PTA_PER_CLK ((2048 * 64 * 1000) / (4 * 64))
#elif defined(CONFIG_FADS)
/* Old/new FADS */
#define CFG_SDRAM_SIZE 0x00400000
/* 4 Mbyte */
#else
/* Old ADS */
...
...
@@ -223,9 +244,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16
/* For all MPC8xx CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4
/* log base 2 of the above value */
#endif
/*-----------------------------------------------------------------------
* I2C configuration
...
...
@@ -277,31 +296,21 @@
* power management and some other internal clocks
*/
#define SCCR_MASK SCCR_EBDF11
#define CFG_SCCR
(SCCR_TBS|SCCR_COM00|SCCR_DFSYNC00|SCCR_DFBRG00|SCCR_DFNL000|SCCR_DFNH000|SCCR_DFLCD000|SCCR_DFALCD00)
#define CFG_SCCR
SCCR_TBS
/*-----------------------------------------------------------------------
*
PLPRCR - PLL, Low-Power, and Reset Control Register 14-22
*
DER - Debug Enable Register
*-----------------------------------------------------------------------
* set the PLL, the low-power modes and the reset control
*/
#ifndef CFG_PLPRCR
#define CFG_PLPRCR PLPRCR_TEXPS
#endif
/*-----------------------------------------------------------------------
*
*-----------------------------------------------------------------------
*
* Set to zero to prevent the processor from entering debug mode
*/
#define CFG_DER 0
/* Because of the way the 860 starts up and assigns CS0 the
* entire address space, we have to set the memory controller
* differently. Normally, you write the option register
* first, and then enable the chip select by writing the
* base register. For CS0, you must write the base register
* first, followed by the option register.
*/
/* Because of the way the 860 starts up and assigns CS0 the entire
* address space, we have to set the memory controller differently.
* Normally, you write the option register first, and then enable the
* chip select by writing the base register. For CS0, you must write
* the base register first, followed by the option register.
*/
/*
* Init Memory Controller:
...
...
@@ -335,9 +344,6 @@
/* values according to the manual */
#define PCMCIA_MEM_ADDR ((uint)0xFF020000)
#define PCMCIA_MEM_SIZE ((uint)(64 * 1024))
#define BCSR0 ((uint) (BCSR_ADDR + 0x00))
#define BCSR1 ((uint) (BCSR_ADDR + 0x04))
#define BCSR2 ((uint) (BCSR_ADDR + 0x08))
...
...
@@ -396,59 +402,28 @@
#define BCSR4_TFPLDL ((uint)0x40000000)
#define BCSR4_TPSQEL ((uint)0x20000000)
#define BCSR4_SIGNAL_LAMP ((uint)0x10000000)
#define BCSR4_FETH_EN ((uint)0x08000000)
#define BCSR4_FETHCFG0 ((uint)0x04000000)
#define BCSR4_FETHFDE ((uint)0x02000000)
#define BCSR4_FETHCFG1 ((uint)0x00400000)
#define BCSR4_FETHRST ((uint)0x00200000)
#ifdef CONFIG_MPC823
#if defined(CONFIG_MPC823)
#define BCSR4_USB_EN ((uint)0x08000000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC860SAR
#define BCSR4_UTOPIA_EN ((uint)0x08000000)
#endif
/* CONFIG_MPC860SAR */
#ifdef CONFIG_MPC860T
#define BCSR4_FETH_EN ((uint)0x08000000)
#endif
/* CONFIG_MPC860T */
#ifdef CONFIG_MPC823
#define BCSR4_USB_SPEED ((uint)0x04000000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC860T
#define BCSR4_FETHCFG0 ((uint)0x04000000)
#endif
/* CONFIG_MPC860T */
#ifdef CONFIG_MPC823
#define BCSR4_VCCO ((uint)0x02000000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC860T
#define BCSR4_FETHFDE ((uint)0x02000000)
#endif
/* CONFIG_MPC860T */
#ifdef CONFIG_MPC823
#define BCSR4_VIDEO_ON ((uint)0x00800000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC823
#define BCSR4_VDO_EKT_CLK_EN ((uint)0x00400000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC860T
#define BCSR4_FETHCFG1 ((uint)0x00400000)
#endif
/* CONFIG_MPC860T */
#ifdef CONFIG_MPC823
#define BCSR4_VIDEO_RST ((uint)0x00200000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC860T
#define BCSR4_FETHRST ((uint)0x00200000)
#endif
/* CONFIG_MPC860T */
#ifdef CONFIG_MPC823
#define BCSR4_MODEM_EN ((uint)0x00100000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC823
#define BCSR4_DATA_VOICE ((uint)0x00080000)
#endif
/* CONFIG_MPC823 */
#ifdef CONFIG_MPC850
#elif defined(CONFIG_MPC850)
#define BCSR4_DATA_VOICE ((uint)0x00080000)
#endif
/* CONFIG_MPC850 */
#elif defined(CONFIG_MPC860SAR)
#define BCSR4_UTOPIA_EN ((uint)0x08000000)
#else
/* MPC860T and other chips with FEC */
#define BCSR4_FETH_EN ((uint)0x08000000)
#define BCSR4_FETHCFG0 ((uint)0x04000000)
#define BCSR4_FETHFDE ((uint)0x02000000)
#define BCSR4_FETHCFG1 ((uint)0x00400000)
#define BCSR4_FETHRST ((uint)0x00200000)
#endif
/* BSCR5 exists on MPC86xADS and
Duet
ADS only */
/* BSCR5 exists on MPC86xADS and
MPC885
ADS only */
#define CFG_PHYDEV_ADDR (BCSR_ADDR + 0x20000)
...
...
@@ -511,4 +486,4 @@
#define CFG_ATA_ALT_OFFSET 0x0000
#define CONFIG_DISK_SPINUP_TIME 1000000
#undef CONFIG_DISK_SPINUP_TIME
/* usin
Compact Flash */
/* #undef CONFIG_DISK_SPINUP_TIME */
/* usin
Compact Flash */
include/configs/MPC86xADS.h
浏览文件 @
8ff0208d
...
...
@@ -21,7 +21,7 @@
#define CONFIG_MPC86xADS 1
/* new ADS */
#define CONFIG_FADS 1
/* We are FADS compatible (more or less) */
/*
New MPC86xADS
- pick one of these */
/*
CPU type
- pick one of these */
#define CONFIG_MPC866T 1
#undef CONFIG_MPC866P
#undef CONFIG_MPC859T
...
...
@@ -33,7 +33,10 @@
#undef CONFIG_8xx_CONS_NONE
#define CONFIG_BAUDRATE 38400
#define CONFIG_8xx_OSCLK 10000000
/* 10MHz oscillator on EXTCLK */
#define CONFIG_8xx_OSCLK 10000000
/* 10MHz oscillator on EXTCLK */
#define CONFIG_8xx_CPUCLK_DEFAULT 50000000
#define CFG_8xx_CPUCLK_MIN 40000000
#define CFG_8xx_CPUCLK_MAX 80000000
#define CONFIG_DRAM_50MHZ 1
#define CONFIG_SDRAM_50MHZ 1
...
...
include/configs/MPC885ADS.h
浏览文件 @
8ff0208d
/*
* A collection of structures, addresses, and values associated with
* the Motorola
DUET
ADS board. Values common to all FADS family boards
* the Motorola
MPC885
ADS board. Values common to all FADS family boards
* are in board/fads/fads.h
*
* Copyright (C) 2003 Arabella Software Ltd.
* Copyright (C) 2003
-2004
Arabella Software Ltd.
* Yuli Barcohen <yuli@arabellasw.com>
*/
#ifndef __CONFIG_H
#define __CONFIG_H
/* Board type */
#define CONFIG_MPC885ADS 1
/* Duet (MPC87x/88x) ADS */
#define CONFIG_MPC885ADS 1
/* MPC885ADS board */
#define CONFIG_FADS 1
/* We are FADS compatible (more or less) */
#define CONFIG_MPC885
1
/* MPC885 CPU (Duet family) */
#define CONFIG_MPC885 1
/* MPC885 CPU (Duet family) */
#define CONFIG_8xx_CONS_SMC1 1
/* Console is on SMC1
*/
#define CONFIG_8xx_CONS_SMC1 1
/* Console is on SMC1
*/
#undef CONFIG_8xx_CONS_SMC2
#undef CONFIG_8xx_CONS_NONE
#define CONFIG_BAUDRATE 38400
#define CONFIG_8xx_OSCLK 10000000
/* 10 MHz oscillator on EXTCLK */
#define CFG_PLPRCR ((1 << PLPRCR_MFD_SHIFT) | (12 << PLPRCR_MFI_SHIFT) | PLPRCR_TEXPS)
#define CONFIG_8xx_OSCLK 10000000
/* 10 MHz oscillator on EXTCLK */
#define CONFIG_8xx_CPUCLK_DEFAULT 50000000
#define CFG_8xx_CPUCLK_MIN 40000000
#define CFG_8xx_CPUCLK_MAX 133000000
#define CONFIG_SDRAM_50MHZ 1
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_DHCP \
| CFG_CMD_IMMAP \
| CFG_CMD_MII \
| CFG_CMD_PING \
)
#include "fads.h"
#undef CFG_SCCR
#define CFG_SCCR (SCCR_TBS|SCCR_EBDF11)
#define CFG_OR5_PRELIM 0xFFFF8110
/* 64Kbyte address space */
#define CFG_BR5_PRELIM (CFG_PHYDEV_ADDR | BR_PS_8 | BR_V)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录