Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
1e841086
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,发现更多精彩内容 >>
提交
1e841086
编写于
10月 12, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
ssh://10.10.0.7/home/wd/git/u-boot/master
上级
33af3e66
72c55878
变更
31
隐藏空白更改
内联
并排
Showing
31 changed file
with
115 addition
and
48 deletion
+115
-48
board/freescale/common/sys_eeprom.c
board/freescale/common/sys_eeprom.c
+1
-1
board/freescale/mpc8313erdb/sdram.c
board/freescale/mpc8313erdb/sdram.c
+1
-1
board/freescale/mpc8315erdb/sdram.c
board/freescale/mpc8315erdb/sdram.c
+1
-1
board/freescale/mpc8349emds/mpc8349emds.c
board/freescale/mpc8349emds/mpc8349emds.c
+1
-1
board/freescale/mpc8349itx/mpc8349itx.c
board/freescale/mpc8349itx/mpc8349itx.c
+1
-1
board/freescale/mpc837xemds/mpc837xemds.c
board/freescale/mpc837xemds/mpc837xemds.c
+1
-1
board/freescale/mpc837xerdb/mpc837xerdb.c
board/freescale/mpc837xerdb/mpc837xerdb.c
+1
-1
board/matrix_vision/mvblm7/mvblm7.c
board/matrix_vision/mvblm7/mvblm7.c
+1
-1
board/sbc8349/sbc8349.c
board/sbc8349/sbc8349.c
+1
-1
cpu/mpc83xx/spd_sdram.c
cpu/mpc83xx/spd_sdram.c
+1
-1
cpu/mpc85xx/cpu.c
cpu/mpc85xx/cpu.c
+2
-1
cpu/mpc85xx/fdt.c
cpu/mpc85xx/fdt.c
+0
-3
cpu/mpc85xx/speed.c
cpu/mpc85xx/speed.c
+4
-3
drivers/mtd/cfi_flash.c
drivers/mtd/cfi_flash.c
+2
-1
include/asm-ppc/immap_85xx.h
include/asm-ppc/immap_85xx.h
+7
-0
include/configs/MPC8313ERDB.h
include/configs/MPC8313ERDB.h
+2
-1
include/configs/MPC8315ERDB.h
include/configs/MPC8315ERDB.h
+1
-0
include/configs/MPC8323ERDB.h
include/configs/MPC8323ERDB.h
+2
-1
include/configs/MPC832XEMDS.h
include/configs/MPC832XEMDS.h
+1
-0
include/configs/MPC8349EMDS.h
include/configs/MPC8349EMDS.h
+1
-0
include/configs/MPC8349ITX.h
include/configs/MPC8349ITX.h
+1
-0
include/configs/MPC8360EMDS.h
include/configs/MPC8360EMDS.h
+1
-0
include/configs/MPC837XEMDS.h
include/configs/MPC837XEMDS.h
+1
-0
include/configs/MPC837XERDB.h
include/configs/MPC837XERDB.h
+2
-1
include/configs/MPC8536DS.h
include/configs/MPC8536DS.h
+1
-2
include/configs/MPC8572DS.h
include/configs/MPC8572DS.h
+17
-2
include/libfdt.h
include/libfdt.h
+27
-1
include/mpc83xx.h
include/mpc83xx.h
+1
-1
lib_ppc/bootm.c
lib_ppc/bootm.c
+1
-1
libfdt/fdt.c
libfdt/fdt.c
+1
-1
libfdt/fdt_ro.c
libfdt/fdt_ro.c
+30
-19
未找到文件。
board/freescale/common/sys_eeprom.c
浏览文件 @
1e841086
...
...
@@ -463,6 +463,6 @@ unsigned int get_cpu_board_revision(void)
if
((
be
.
major
==
0xff
)
&&
(
be
.
minor
==
0xff
))
return
MPC85XX_CPU_BOARD_REV
(
0
,
0
);
return
MPC85XX_CPU_BOARD_REV
(
e
.
major
,
e
.
minor
);
return
MPC85XX_CPU_BOARD_REV
(
be
.
major
,
b
e
.
minor
);
}
#endif
board/freescale/mpc8313erdb/sdram.c
浏览文件 @
1e841086
...
...
@@ -64,7 +64,7 @@ static long fixed_sdram(void)
volatile
immap_t
*
im
=
(
volatile
immap_t
*
)
CFG_IMMR
;
u32
msize_log2
=
__ilog2
(
msize
);
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
>>
12
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LBLAWAR_EN
|
(
msize_log2
-
1
);
im
->
sysconf
.
ddrcdr
=
CFG_DDRCDR_VALUE
;
...
...
board/freescale/mpc8315erdb/sdram.c
浏览文件 @
1e841086
...
...
@@ -60,7 +60,7 @@ static long fixed_sdram(void)
u32
msize
=
CFG_DDR_SIZE
*
1024
*
1024
;
u32
msize_log2
=
__ilog2
(
msize
);
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
>>
12
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LBLAWAR_EN
|
(
msize_log2
-
1
);
im
->
sysconf
.
ddrcdr
=
CFG_DDRCDR_VALUE
;
...
...
board/freescale/mpc8349emds/mpc8349emds.c
浏览文件 @
1e841086
...
...
@@ -109,7 +109,7 @@ int fixed_sdram(void)
return
-
1
;
}
}
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
((
CFG_DDR_SDRAM_BASE
>>
12
)
&
0xfffff
)
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LAWAR_EN
|
((
ddr_size_log2
-
1
)
&
LAWAR_SIZE
);
#if (CFG_DDR_SIZE != 256)
...
...
board/freescale/mpc8349itx/mpc8349itx.c
浏览文件 @
1e841086
...
...
@@ -55,7 +55,7 @@ int fixed_sdram(void)
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LAWAR_EN
|
((
ddr_size_log2
-
1
)
&
LAWAR_SIZE
);
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
(
CFG_DDR_SDRAM_BASE
>>
12
)
&
0xfffff
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
/* Only one CS0 for DDR */
im
->
ddr
.
csbnds
[
0
].
csbnds
=
0x0000000f
;
...
...
board/freescale/mpc837xemds/mpc837xemds.c
浏览文件 @
1e841086
...
...
@@ -108,7 +108,7 @@ int fixed_sdram(void)
u32
msize
=
CFG_DDR_SIZE
*
1024
*
1024
;
u32
msize_log2
=
__ilog2
(
msize
);
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
>>
12
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LBLAWAR_EN
|
(
msize_log2
-
1
);
#if (CFG_DDR_SIZE != 512)
...
...
board/freescale/mpc837xerdb/mpc837xerdb.c
浏览文件 @
1e841086
...
...
@@ -96,7 +96,7 @@ int fixed_sdram(void)
u32
msize
=
CFG_DDR_SIZE
*
1024
*
1024
;
u32
msize_log2
=
__ilog2
(
msize
);
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
>>
12
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LBLAWAR_EN
|
(
msize_log2
-
1
);
im
->
sysconf
.
ddrcdr
=
CFG_DDRCDR_VALUE
;
...
...
board/matrix_vision/mvblm7/mvblm7.c
浏览文件 @
1e841086
...
...
@@ -50,7 +50,7 @@ int fixed_sdram(void)
if
(
ddr_size
&
1
)
return
-
1
;
}
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
((
CFG_DDR_SDRAM_BASE
>>
12
)
&
0xfffff
)
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LAWAR_EN
|
((
ddr_size_log2
-
1
)
&
LAWAR_SIZE
);
...
...
board/sbc8349/sbc8349.c
浏览文件 @
1e841086
...
...
@@ -101,7 +101,7 @@ int fixed_sdram(void)
return
-
1
;
}
}
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
((
CFG_DDR_SDRAM_BASE
>>
12
)
&
0xfffff
)
;
im
->
sysconf
.
ddrlaw
[
0
].
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
im
->
sysconf
.
ddrlaw
[
0
].
ar
=
LAWAR_EN
|
((
ddr_size_log2
-
1
)
&
LAWAR_SIZE
);
#if (CFG_DDR_SIZE != 256)
...
...
cpu/mpc83xx/spd_sdram.c
浏览文件 @
1e841086
...
...
@@ -274,7 +274,7 @@ long int spd_sdram()
/*
* Set up LAWBAR for all of DDR.
*/
ecm
->
bar
=
((
CFG_DDR_SDRAM_BASE
>>
12
)
&
0xfffff
)
;
ecm
->
bar
=
CFG_DDR_SDRAM_BASE
&
0xfffff000
;
ecm
->
ar
=
(
LAWAR_EN
|
LAWAR_TRGT_IF_DDR
|
(
LAWAR_SIZE
&
law_size
));
debug
(
"DDR:bar=0x%08x
\n
"
,
ecm
->
bar
);
debug
(
"DDR:ar=0x%08x
\n
"
,
ecm
->
ar
);
...
...
cpu/mpc85xx/cpu.c
浏览文件 @
1e841086
...
...
@@ -85,7 +85,8 @@ int checkcpu (void)
struct
cpu_type
*
cpu
;
#ifdef CONFIG_DDR_CLK_FREQ
volatile
ccsr_gur_t
*
gur
=
(
void
*
)(
CFG_MPC85xx_GUTS_ADDR
);
u32
ddr_ratio
=
((
gur
->
porpllsr
)
&
0x00003e00
)
>>
9
;
u32
ddr_ratio
=
((
gur
->
porpllsr
)
&
MPC85xx_PORPLLSR_DDR_RATIO
)
>>
MPC85xx_PORPLLSR_DDR_RATIO_SHIFT
;
#else
u32
ddr_ratio
=
0
;
#endif
...
...
cpu/mpc85xx/fdt.c
浏览文件 @
1e841086
...
...
@@ -152,7 +152,6 @@ static inline void ft_fixup_l2cache(void *blob)
}
fdt_setprop
(
blob
,
off
,
"cache-unified"
,
NULL
,
0
);
fdt_setprop_cell
(
blob
,
off
,
"cache-block-size"
,
line_size
);
fdt_setprop_cell
(
blob
,
off
,
"cache-line-size"
,
line_size
);
fdt_setprop_cell
(
blob
,
off
,
"cache-size"
,
size
);
fdt_setprop_cell
(
blob
,
off
,
"cache-sets"
,
num_sets
);
fdt_setprop_cell
(
blob
,
off
,
"cache-level"
,
2
);
...
...
@@ -181,7 +180,6 @@ static inline void ft_fixup_cache(void *blob)
dnum_sets
=
dsize
/
(
dline_size
*
dnum_ways
);
fdt_setprop_cell
(
blob
,
off
,
"d-cache-block-size"
,
dline_size
);
fdt_setprop_cell
(
blob
,
off
,
"d-cache-line-size"
,
dline_size
);
fdt_setprop_cell
(
blob
,
off
,
"d-cache-size"
,
dsize
);
fdt_setprop_cell
(
blob
,
off
,
"d-cache-sets"
,
dnum_sets
);
...
...
@@ -192,7 +190,6 @@ static inline void ft_fixup_cache(void *blob)
inum_sets
=
isize
/
(
iline_size
*
inum_ways
);
fdt_setprop_cell
(
blob
,
off
,
"i-cache-block-size"
,
iline_size
);
fdt_setprop_cell
(
blob
,
off
,
"i-cache-line-size"
,
iline_size
);
fdt_setprop_cell
(
blob
,
off
,
"i-cache-size"
,
isize
);
fdt_setprop_cell
(
blob
,
off
,
"i-cache-sets"
,
inum_sets
);
...
...
cpu/mpc85xx/speed.c
浏览文件 @
1e841086
...
...
@@ -54,7 +54,8 @@ void get_sys_info (sys_info_t * sysInfo)
#ifdef CONFIG_DDR_CLK_FREQ
{
u32
ddr_ratio
=
((
gur
->
porpllsr
)
&
0x00003e00
)
>>
9
;
u32
ddr_ratio
=
((
gur
->
porpllsr
)
&
MPC85xx_PORPLLSR_DDR_RATIO
)
>>
MPC85xx_PORPLLSR_DDR_RATIO_SHIFT
;
if
(
ddr_ratio
!=
0x7
)
sysInfo
->
freqDDRBus
=
ddr_ratio
*
CONFIG_DDR_CLK_FREQ
;
}
...
...
@@ -101,9 +102,9 @@ int get_clocks (void)
* PORDEVSR2_SEC_CFG bit is 0 on all 85xx boards that are not an 8544.
*/
if
(
gur
->
pordevsr2
&
MPC85xx_PORDEVSR2_SEC_CFG
)
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
/
3
;
else
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
/
2
;
else
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
/
3
;
#else
/* Most 85xx SOCs use CCB/2, so this is the default behavior. */
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
/
2
;
...
...
drivers/mtd/cfi_flash.c
浏览文件 @
1e841086
...
...
@@ -1932,9 +1932,10 @@ ulong flash_get_size (ulong base, int banknum)
/* XXX - Need to test on x8/x16 in parallel. */
info
->
portwidth
>>=
1
;
}
flash_write_cmd
(
info
,
0
,
0
,
info
->
cmd_reset
);
}
flash_write_cmd
(
info
,
0
,
0
,
info
->
cmd_reset
);
return
(
info
->
size
);
}
...
...
include/asm-ppc/immap_85xx.h
浏览文件 @
1e841086
...
...
@@ -1552,6 +1552,13 @@ typedef struct par_io {
*/
typedef
struct
ccsr_gur
{
uint
porpllsr
;
/* 0xe0000 - POR PLL ratio status register */
#ifdef CONFIG_MPC8536
#define MPC85xx_PORPLLSR_DDR_RATIO 0x3e000000
#define MPC85xx_PORPLLSR_DDR_RATIO_SHIFT 25
#else
#define MPC85xx_PORPLLSR_DDR_RATIO 0x00003e00
#define MPC85xx_PORPLLSR_DDR_RATIO_SHIFT 9
#endif
uint
porbmsr
;
/* 0xe0004 - POR boot mode status register */
#define MPC85xx_PORBMSR_HA 0x00070000
uint
porimpscr
;
/* 0xe0008 - POR I/O impedance status and control register */
...
...
include/configs/MPC8313ERDB.h
浏览文件 @
1e841086
...
...
@@ -174,6 +174,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* start of FLASH */
#define CFG_FLASH_SIZE 8
/* flash size in MB */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_FLASH_EMPTY_INFO
/* display empty sectors */
#define CFG_FLASH_USE_BUFFER_WRITE
/* buffer up multiple bytes */
...
...
@@ -596,7 +597,7 @@
#define CONFIG_FDTFILE mpc8313erdb.dtb
#define CONFIG_LOADADDR 500000
/* default location for tftp and bootm */
#define CONFIG_BOOTDELAY
-1
/* -1 disables auto-boot */
#define CONFIG_BOOTDELAY
6
/* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define XMK_STR(x) #x
...
...
include/configs/MPC8315ERDB.h
浏览文件 @
1e841086
...
...
@@ -193,6 +193,7 @@
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 8
/* FLASH size is 8M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE
/* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000016
/* 8MB window size */
...
...
include/configs/MPC8323ERDB.h
浏览文件 @
1e841086
...
...
@@ -181,6 +181,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 16
/* FLASH size is 16M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE
/* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018
/* 32MB window size */
...
...
@@ -570,7 +571,7 @@
#define CONFIG_FDTFILE mpc832x_rdb.dtb
#define CONFIG_LOADADDR 500000
/* default location for tftp and bootm */
#define CONFIG_BOOTDELAY
-1
/* -1 disables auto-boot */
#define CONFIG_BOOTDELAY
6
/* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define XMK_STR(x) #x
...
...
include/configs/MPC832XEMDS.h
浏览文件 @
1e841086
...
...
@@ -169,6 +169,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 16
/* FLASH size is 16M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE
/* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018
/* 32MB window size */
...
...
include/configs/MPC8349EMDS.h
浏览文件 @
1e841086
...
...
@@ -156,6 +156,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* start of FLASH */
#define CFG_FLASH_SIZE 32
/* max flash size in MB */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
/* #define CFG_FLASH_USE_BUFFER_WRITE */
#define CFG_BR0_PRELIM (CFG_FLASH_BASE |
/* flash Base address */
\
...
...
include/configs/MPC8349ITX.h
浏览文件 @
1e841086
...
...
@@ -190,6 +190,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE, CFG_FLASH_BASE + 0x800000}
#define CFG_FLASH_SIZE 16
/* FLASH size in MB */
#define CFG_FLASH_SIZE_SHIFT 4
/* log2 of the above value */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
/* Vitesse 7385 */
...
...
include/configs/MPC8360EMDS.h
浏览文件 @
1e841086
...
...
@@ -194,6 +194,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 32
/* max FLASH size is 32M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CONFIG_FLASH_SHOW_PROGRESS 45
/* count down from 45/5: 9..1 */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE
/* Window base at flash base */
...
...
include/configs/MPC837XEMDS.h
浏览文件 @
1e841086
...
...
@@ -229,6 +229,7 @@
#define CONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 32
/* max FLASH size is 32M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE
/* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018
/* 32MB window size */
...
...
include/configs/MPC837XERDB.h
浏览文件 @
1e841086
...
...
@@ -253,6 +253,7 @@
#define CFG_FLASH_BASE 0xFE000000
/* FLASH base address */
#define CFG_FLASH_SIZE 8
/* max FLASH size is 32M */
#define CFG_FLASH_PROTECTION 1
/* Use h/w Flash protection. */
#define CFG_FLASH_EMPTY_INFO
/* display empty sectors */
#define CFG_FLASH_USE_BUFFER_WRITE
/* buffer up multiple bytes */
...
...
@@ -632,7 +633,7 @@
#define CONFIG_FDTFILE mpc8379_rdb.dtb
#define CONFIG_LOADADDR 500000
/* default location for tftp and bootm */
#define CONFIG_BOOTDELAY
-1
/* -1 disables auto-boot */
#define CONFIG_BOOTDELAY
6
/* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define XMK_STR(x) #x
...
...
include/configs/MPC8536DS.h
浏览文件 @
1e841086
...
...
@@ -59,7 +59,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
extern
unsigned
long
get_board_ddr_clk
(
unsigned
long
dummy
);
#endif
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0)
/* sysclk for MPC85xx */
/* #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk(0) /\* ddrclk for MPC85xx *\/ FIXME-8536*/
#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk(0)
#define CONFIG_ICS307_REFCLK_HZ 33333000
/* ICS307 clock chip ref freq */
#define CONFIG_GET_CLK_FROM_ICS307
/* decode sysclk and ddrclk freq
from ICS307 instead of switches */
...
...
@@ -303,7 +303,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_ID_EEPROM
#ifdef CONFIG_ID_EEPROM
#define CONFIG_ID_EEPROM
#define CFG_I2C_EEPROM_NXID
#endif
#define CFG_I2C_EEPROM_ADDR 0x57
...
...
include/configs/MPC8572DS.h
浏览文件 @
1e841086
...
...
@@ -108,6 +108,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_CHIP_SELECTS_PER_CTRL 2
/* I2C addresses of SPD EEPROMs */
#define CFG_SPD_BUS_NUM 1
/* SPD EEPROMS locate on I2C bus 1 */
#define SPD_EEPROM_ADDRESS1 0x51
/* CTLR 0 DIMM 0 */
#define SPD_EEPROM_ADDRESS2 0x52
/* CTLR 1 DIMM 0 */
...
...
@@ -293,11 +294,25 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_FSL_I2C
/* Use FSL common I2C driver */
#define CONFIG_HARD_I2C
/* I2C with hardware support */
#undef CONFIG_SOFT_I2C
/* I2C bit-banged */
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_I2C_CMD_TREE
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address */
#define CFG_I2C_EEPROM_ADDR 0x57
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_NOPROBES {0x69}
/* Don't probe these addrs */
#define CFG_I2C_OFFSET 0x3100
#define CFG_I2C_NOPROBES {{0,0x29}}
/* Don't probe these addrs */
#define CFG_I2C_OFFSET 0x3000
#define CFG_I2C2_OFFSET 0x3100
/*
* I2C2 EEPROM
*/
#define CONFIG_ID_EEPROM
#ifdef CONFIG_ID_EEPROM
#define CFG_I2C_EEPROM_NXID
#endif
#define CFG_I2C_EEPROM_ADDR 0x57
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_BUS_NUM 1
/*
* General PCI
...
...
include/libfdt.h
浏览文件 @
1e841086
...
...
@@ -122,7 +122,7 @@
/* Low-level functions (you probably don't need these) */
/**********************************************************************/
const
void
*
fdt_offset_ptr
(
const
void
*
fdt
,
int
offset
,
int
checklen
);
const
void
*
fdt_offset_ptr
(
const
void
*
fdt
,
int
offset
,
unsigned
int
checklen
);
static
inline
void
*
fdt_offset_ptr_w
(
void
*
fdt
,
int
offset
,
int
checklen
)
{
return
(
void
*
)(
uintptr_t
)
fdt_offset_ptr
(
fdt
,
offset
,
checklen
);
...
...
@@ -458,6 +458,32 @@ static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
*/
uint32_t
fdt_get_phandle
(
const
void
*
fdt
,
int
nodeoffset
);
/**
* fdt_get_alias_namelen - get alias based on substring
* @fdt: pointer to the device tree blob
* @name: name of the alias th look up
* @namelen: number of characters of name to consider
*
* Identical to fdt_get_alias(), but only examine the first namelen
* characters of name for matching the alias name.
*/
const
char
*
fdt_get_alias_namelen
(
const
void
*
fdt
,
const
char
*
name
,
int
namelen
);
/**
* fdt_get_alias - retreive the path referenced by a given alias
* @fdt: pointer to the device tree blob
* @name: name of the alias th look up
*
* fdt_get_alias() retrieves the value of a given alias. That is, the
* value of the property named 'name' in the node /aliases.
*
* returns:
* a pointer to the expansion of the alias named 'name', of it exists
* NULL, if the given alias or the /aliases node does not exist
*/
const
char
*
fdt_get_alias
(
const
void
*
fdt
,
const
char
*
name
);
/**
* fdt_get_path - determine the full path of a node
* @fdt: pointer to the device tree blob
...
...
include/mpc83xx.h
浏览文件 @
1e841086
...
...
@@ -528,7 +528,7 @@
#if defined(CONFIG_MPC834X)
#define HRCWH_ROM_LOC_PCI2 0x00200000
#endif
#if defined(CON
IF
G_MPC837X)
#if defined(CON
FI
G_MPC837X)
#define HRCWH_ROM_LOC_ON_CHIP_ROM 0x00300000
#endif
#define HRCWH_ROM_LOC_LOCAL_8BIT 0x00500000
...
...
lib_ppc/bootm.c
浏览文件 @
1e841086
...
...
@@ -145,7 +145,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
* if the user wants it (the logic is in the subroutines).
*/
if
(
of_size
)
{
if
(
fdt_chosen
(
of_flat_tree
,
0
)
<
0
)
{
if
(
fdt_chosen
(
of_flat_tree
,
1
)
<
0
)
{
puts
(
"ERROR: "
);
puts
(
"/chosen node create failed"
);
puts
(
" - must RESET the board to recover.
\n
"
);
...
...
libfdt/fdt.c
浏览文件 @
1e841086
...
...
@@ -78,7 +78,7 @@ int fdt_check_header(const void *fdt)
return
0
;
}
const
void
*
fdt_offset_ptr
(
const
void
*
fdt
,
int
offset
,
int
len
)
const
void
*
fdt_offset_ptr
(
const
void
*
fdt
,
int
offset
,
unsigned
int
len
)
{
const
char
*
p
;
...
...
libfdt/fdt_ro.c
浏览文件 @
1e841086
...
...
@@ -145,17 +145,12 @@ int fdt_path_offset(const void *fdt, const char *path)
/* see if we have an alias */
if
(
*
path
!=
'/'
)
{
const
char
*
q
;
int
aliasoffset
=
fdt_path_offset
(
fdt
,
"/aliases"
);
if
(
aliasoffset
<
0
)
return
-
FDT_ERR_BADPATH
;
const
char
*
q
=
strchr
(
path
,
'/'
);
q
=
strchr
(
path
,
'/'
);
if
(
!
q
)
q
=
end
;
p
=
fdt_get
prop_namelen
(
fdt
,
aliasoffset
,
path
,
q
-
p
,
NULL
);
p
=
fdt_get
_alias_namelen
(
fdt
,
p
,
q
-
p
);
if
(
!
p
)
return
-
FDT_ERR_BADPATH
;
offset
=
fdt_path_offset
(
fdt
,
p
);
...
...
@@ -306,6 +301,23 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
return
fdt32_to_cpu
(
*
php
);
}
const
char
*
fdt_get_alias_namelen
(
const
void
*
fdt
,
const
char
*
name
,
int
namelen
)
{
int
aliasoffset
;
aliasoffset
=
fdt_path_offset
(
fdt
,
"/aliases"
);
if
(
aliasoffset
<
0
)
return
NULL
;
return
fdt_getprop_namelen
(
fdt
,
aliasoffset
,
name
,
namelen
,
NULL
);
}
const
char
*
fdt_get_alias
(
const
void
*
fdt
,
const
char
*
name
)
{
return
fdt_get_alias_namelen
(
fdt
,
name
,
strlen
(
name
));
}
int
fdt_get_path
(
const
void
*
fdt
,
int
nodeoffset
,
char
*
buf
,
int
buflen
)
{
int
pdepth
=
0
,
p
=
0
;
...
...
@@ -320,9 +332,6 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
for
(
offset
=
0
,
depth
=
0
;
(
offset
>=
0
)
&&
(
offset
<=
nodeoffset
);
offset
=
fdt_next_node
(
fdt
,
offset
,
&
depth
))
{
if
(
pdepth
<
depth
)
continue
;
/* overflowed buffer */
while
(
pdepth
>
depth
)
{
do
{
p
--
;
...
...
@@ -330,14 +339,16 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
pdepth
--
;
}
name
=
fdt_get_name
(
fdt
,
offset
,
&
namelen
);
if
(
!
name
)
return
namelen
;
if
((
p
+
namelen
+
1
)
<=
buflen
)
{
memcpy
(
buf
+
p
,
name
,
namelen
);
p
+=
namelen
;
buf
[
p
++
]
=
'/'
;
pdepth
++
;
if
(
pdepth
>=
depth
)
{
name
=
fdt_get_name
(
fdt
,
offset
,
&
namelen
);
if
(
!
name
)
return
namelen
;
if
((
p
+
namelen
+
1
)
<=
buflen
)
{
memcpy
(
buf
+
p
,
name
,
namelen
);
p
+=
namelen
;
buf
[
p
++
]
=
'/'
;
pdepth
++
;
}
}
if
(
offset
==
nodeoffset
)
{
...
...
@@ -347,7 +358,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
if
(
p
>
1
)
/* special case so that root path is "/", not "" */
p
--
;
buf
[
p
]
=
'\0'
;
return
p
;
return
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录