Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
2c3dc792
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,发现更多精彩内容 >>
提交
2c3dc792
编写于
9月 26, 2014
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-mpc85xx
上级
f9860cf0
039b7739
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
82 addition
and
39 deletion
+82
-39
arch/powerpc/config.mk
arch/powerpc/config.mk
+1
-0
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+0
-5
arch/powerpc/cpu/mpc8xxx/fdt.c
arch/powerpc/cpu/mpc8xxx/fdt.c
+9
-11
board/freescale/t1040qds/eth.c
board/freescale/t1040qds/eth.c
+4
-0
board/freescale/t104xrdb/MAINTAINERS
board/freescale/t104xrdb/MAINTAINERS
+1
-0
board/freescale/t104xrdb/README
board/freescale/t104xrdb/README
+18
-5
board/freescale/t104xrdb/ddr.c
board/freescale/t104xrdb/ddr.c
+2
-2
board/freescale/t104xrdb/eth.c
board/freescale/t104xrdb/eth.c
+10
-0
board/freescale/t104xrdb/t1042_pi_rcw.cfg
board/freescale/t104xrdb/t1042_pi_rcw.cfg
+7
-0
board/freescale/t104xrdb/t1042_rcw.cfg
board/freescale/t104xrdb/t1042_rcw.cfg
+4
-4
configs/T1042RDB_defconfig
configs/T1042RDB_defconfig
+4
-0
drivers/net/fm/t1040.c
drivers/net/fm/t1040.c
+0
-2
include/configs/B4860QDS.h
include/configs/B4860QDS.h
+10
-2
include/configs/T104xRDB.h
include/configs/T104xRDB.h
+12
-8
未找到文件。
arch/powerpc/config.mk
浏览文件 @
2c3dc792
...
...
@@ -11,6 +11,7 @@ endif
CONFIG_STANDALONE_LOAD_ADDR
?=
0x40000
LDFLAGS_FINAL
+=
--gc-sections
LDFLAGS_FINAL
+=
--bss-plt
PLATFORM_RELFLAGS
+=
-fpic
-mrelocatable
-ffunction-sections
-fdata-sections
\
-meabi
PLATFORM_CPPFLAGS
+=
-D__powerpc__
-ffixed-r2
...
...
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
浏览文件 @
2c3dc792
...
...
@@ -186,11 +186,6 @@ u64 serdes_init(u32 sd, u32 sd_addr, u32 sd_prctl_mask, u32 sd_prctl_shift)
#endif
cfg
=
in_be32
(
&
gur
->
rcwsr
[
4
])
&
sd_prctl_mask
;
/* Is serdes enabled at all? */
if
(
!
cfg
)
{
printf
(
"SERDES%d is not enabled
\n
"
,
sd
+
1
);
return
0
;
}
/* Erratum A-007186
* Freescale Scratch Pad Fuse Register n (SFP_FSPFR0)
...
...
arch/powerpc/cpu/mpc8xxx/fdt.c
浏览文件 @
2c3dc792
/*
* Copyright 2009-201
2
Freescale Semiconductor, Inc.
* Copyright 2009-201
4
Freescale Semiconductor, Inc.
*
* This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
* arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
...
...
@@ -123,14 +123,14 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
{
const
char
*
modes
[]
=
{
"host"
,
"peripheral"
,
"otg"
};
const
char
*
phys
[]
=
{
"ulpi"
,
"utmi"
};
const
char
*
dr_mode_type
=
NULL
;
const
char
*
dr_phy_type
=
NULL
;
int
usb_mode_off
=
-
1
;
int
usb_phy_off
=
-
1
;
char
str
[
5
];
int
i
,
j
;
for
(
i
=
1
;
i
<=
CONFIG_USB_MAX_CONTROLLER_COUNT
;
i
++
)
{
const
char
*
dr_mode_type
=
NULL
;
const
char
*
dr_phy_type
=
NULL
;
int
mode_idx
=
-
1
,
phy_idx
=
-
1
;
snprintf
(
str
,
5
,
"%s%d"
,
"usb"
,
i
);
if
(
hwconfig
(
str
))
{
...
...
@@ -150,18 +150,16 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
}
}
if
(
mode_idx
<
0
||
phy_idx
<
0
)
{
puts
(
"ERROR: wrong usb mode/phy defined!!
\n
"
);
return
;
}
dr_mode_type
=
modes
[
mode_idx
];
dr_phy_type
=
phys
[
phy_idx
];
if
(
mode_idx
<
0
&&
phy_idx
<
0
)
{
printf
(
"WARNING: invalid phy or mode
\n
"
);
return
;
}
if
(
mode_idx
>
-
1
)
dr_mode_type
=
modes
[
mode_idx
];
if
(
phy_idx
>
-
1
)
dr_phy_type
=
phys
[
phy_idx
];
}
usb_mode_off
=
fdt_fixup_usb_mode_phy_type
(
blob
,
...
...
board/freescale/t1040qds/eth.c
浏览文件 @
2c3dc792
...
...
@@ -241,6 +241,8 @@ static void initialize_lane_to_slot(void)
break
;
case
0xA7
:
lane_to_slot
[
1
]
=
7
;
lane_to_slot
[
2
]
=
6
;
lane_to_slot
[
3
]
=
5
;
lane_to_slot
[
7
]
=
7
;
break
;
case
0xAA
:
...
...
@@ -410,6 +412,8 @@ void t1040_handle_phy_interface_sgmii(int i)
fm_info_set_phy_address
(
i
,
riser_phy_addr
[
1
]);
if
(
FM1_DTSEC3
==
i
)
fm_info_set_phy_address
(
i
,
riser_phy_addr
[
2
]);
if
(
FM1_DTSEC5
==
i
)
fm_info_set_phy_address
(
i
,
riser_phy_addr
[
3
]);
mdio_mux
[
i
]
=
EMI1_SLOT7
;
fm_info_set_mdio
(
i
,
mii_dev_for_muxval
(
mdio_mux
[
i
]));
...
...
board/freescale/t104xrdb/MAINTAINERS
浏览文件 @
2c3dc792
...
...
@@ -6,6 +6,7 @@ F: include/configs/T104xRDB.h
F: configs/T1040RDB_defconfig
F: configs/T1040RDB_NAND_defconfig
F: configs/T1040RDB_SPIFLASH_defconfig
F: configs/T1042RDB_defconfig
F: configs/T1042RDB_PI_defconfig
F: configs/T1042RDB_PI_NAND_defconfig
F: configs/T1042RDB_PI_SPIFLASH_defconfig
...
...
board/freescale/t104xrdb/README
浏览文件 @
2c3dc792
...
...
@@ -4,10 +4,23 @@ The T1040RDB is a Freescale reference board that hosts the T1040 SoC
(and variants). Variants inclued T1042 presonality of T1040, in which
case T1040RDB can also be called T1042RDB.
The T1042RDB is a Freescale reference board that hosts the T1042 SoC
(and variants). The board is similar to T1040RDB, T1040 is a reduced
personality of T1040 SoC without Integrated 8-port Gigabit(L2 Switch).
The T1042RDB_PI is a Freescale reference board that hosts the T1042 SoC.
(a personality of T1040 SoC). The board is similar to T1040RDB but is
designed specially with low power features targeted for Printing Image Market.
Basic difference's among T1040RDB, T1042RDB_PI, T1042RDB
-------------------------------------------------------------------------
Board Si Protocol Targeted Market
-------------------------------------------------------------------------
T1040RDB T1040 0x66 Networking
T1040RDB T1042 0x86 Networking
T1042RDB_PI T1042 0x06 Printing & Imaging
T1040 SoC Overview
------------------
The QorIQ T1040/T1042 processor support four integrated 64-bit e5500 PA
...
...
@@ -194,10 +207,10 @@ The below commands apply to the board
Commands for switching to alternate bank.
1. To change from vbank0 to vbank4
=>
qixis_
reset altbank (it will boot using vbank4)
=>
cpld
reset altbank (it will boot using vbank4)
2.To change from vbank4 to vbank0
=>
qixis
reset (it will boot using vbank0)
=>
cpld
reset (it will boot using vbank0)
NAND boot with 2 Stage boot loader
----------------------------------
...
...
@@ -259,15 +272,15 @@ Switch Settings: (ON is 0, OFF is 1)
===============
NAND boot SW setting:
SW1: 10001000
SW2: 001110
0
1
SW2: 001110
1
1
SW3: 11110001
SPI boot SW setting:
SW1: 00100010
SW2: 101110
0
1
SW2: 101110
1
1
SW3: 11100001
SD boot SW setting:
SW1: 00100000
SW2: 001110
0
1
SW2: 001110
1
1
SW3: 11100001
board/freescale/t104xrdb/ddr.c
浏览文件 @
2c3dc792
...
...
@@ -105,8 +105,8 @@ found:
popts
->
zq_en
=
1
;
/* DHC_EN =1, ODT = 75 Ohm */
popts
->
ddr_cdr1
=
DDR_CDR1_DHC_EN
|
DDR_CDR1_ODT
(
DDR_CDR_ODT_
OFF
);
popts
->
ddr_cdr2
=
DDR_CDR2_ODT
(
DDR_CDR_ODT_
OFF
);
popts
->
ddr_cdr1
=
DDR_CDR1_DHC_EN
|
DDR_CDR1_ODT
(
DDR_CDR_ODT_
75ohm
);
popts
->
ddr_cdr2
=
DDR_CDR2_ODT
(
DDR_CDR_ODT_
75ohm
);
}
phys_size_t
initdram
(
int
board_type
)
...
...
board/freescale/t104xrdb/eth.c
浏览文件 @
2c3dc792
...
...
@@ -42,6 +42,16 @@ int board_eth_init(bd_t *bis)
fm_info_set_phy_address
(
FM1_DTSEC3
,
CONFIG_SYS_SGMII1_PHY_ADDR
);
break
;
#endif
#ifdef CONFIG_T1042RDB
case
PHY_INTERFACE_MODE_SGMII
:
/* T1042RDB doesn't supports SGMII on DTSEC1 & DTSEC2 */
if
((
FM1_DTSEC1
==
i
)
||
(
FM1_DTSEC2
==
i
))
fm_info_set_phy_address
(
i
,
0
);
/* T1042RDB only supports SGMII on DTSEC3 */
fm_info_set_phy_address
(
FM1_DTSEC3
,
CONFIG_SYS_SGMII1_PHY_ADDR
);
break
;
#endif
case
PHY_INTERFACE_MODE_RGMII
:
if
(
FM1_DTSEC4
==
i
)
...
...
board/freescale/t104xrdb/t1042_pi_rcw.cfg
0 → 100644
浏览文件 @
2c3dc792
#PBL preamble and RCW header
aa55aa55 010e0100
# serdes protocol 0x06
0c18000e 0e000000 00000000 00000000
06000002 00400002 e8106000 01000000
00000000 00000000 00000000 00030810
00000000 01fe0a06 00000000 00000000
board/freescale/t104xrdb/t1042_rcw.cfg
浏览文件 @
2c3dc792
#PBL preamble and RCW header
aa55aa55 010e0100
# serdes protocol 0x
6
6
# serdes protocol 0x
8
6
0c18000e 0e000000 00000000 00000000
06000002 00400002 e8106
000 01000000
00000000 00000000 00000000 0003
0
810
00000000 0
1fe0a06
00000000 00000000
86000002 80000002 ec027
000 01000000
00000000 00000000 00000000 0003
2
810
00000000 0
342500f
00000000 00000000
configs/T1042RDB_defconfig
0 → 100644
浏览文件 @
2c3dc792
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
drivers/net/fm/t1040.c
浏览文件 @
2c3dc792
...
...
@@ -49,8 +49,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
else
if
((
rcwsr13
&
FSL_CORENET_RCWSR13_EC2
)
==
FSL_CORENET_RCWSR13_EC2_FM1_DTSEC5_MII
)
return
PHY_INTERFACE_MODE_MII
;
else
return
PHY_INTERFACE_MODE_NONE
;
}
switch
(
port
)
{
...
...
include/configs/B4860QDS.h
浏览文件 @
2c3dc792
...
...
@@ -227,6 +227,7 @@ unsigned long get_board_ddr_clk(void);
#endif
/* EEPROM */
#define CONFIG_ID_EEPROM
#define CONFIG_SYS_I2C_EEPROM_NXID
#define CONFIG_SYS_EEPROM_BUS_NUM 0
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
...
...
@@ -819,9 +820,16 @@ unsigned long get_board_ddr_clk(void);
#define __USB_PHY_TYPE ulpi
#ifdef CONFIG_PPC_B4860
#define HWCONFIG "hwconfig=fsl_ddr:ctlr_intlv=null," \
"bank_intlv=cs0_cs1;" \
"en_cpc:cpc2;"
#else
#define HWCONFIG "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=null," \
"bank_intlv=cs0_cs1;" \
HWCONFIG \
"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
"netdev=eth0\0" \
"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \
...
...
include/configs/T104xRDB.h
浏览文件 @
2c3dc792
...
...
@@ -19,6 +19,9 @@
#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1040_rcw.cfg
#endif
#ifdef CONFIG_T1042RDB_PI
#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_rcw.cfg
#endif
#ifdef CONFIG_T1042RDB
#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg
#endif
...
...
@@ -477,7 +480,7 @@
/* I2C bus multiplexer */
#define I2C_MUX_PCA_ADDR 0x70
#if
def CONFIG_T1040RDB
#if
defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
#define I2C_MUX_CH_DEFAULT 0x8
#endif
...
...
@@ -634,7 +637,7 @@
#define CONFIG_SYS_DPAA_FMAN
#define CONFIG_SYS_DPAA_PME
#if
def CONFIG_T1040RDB
#if
defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
#define CONFIG_QE
#define CONFIG_U_QE
#endif
...
...
@@ -663,7 +666,7 @@
#define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000
#endif
#if
def CONFIG_T1040RDB
#if
defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_QE_FW_ADDR 0x130000
#elif defined(CONFIG_SDCARD)
...
...
@@ -687,7 +690,7 @@
#endif
#ifdef CONFIG_FMAN_ENET
#if
def CONFIG_T1040RDB
#if
defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
#define CONFIG_SYS_SGMII1_PHY_ADDR 0x03
#endif
#define CONFIG_SYS_RGMII1_PHY_ADDR 0x01
...
...
@@ -789,13 +792,14 @@
#define CONFIG_BAUDRATE 115200
#define __USB_PHY_TYPE utmi
#define RAMDISKFILE "t104xrdb/ramdisk.uboot"
#ifdef CONFIG_T1040RDB
#define FDTFILE "t1040rdb/t1040rdb.dtb"
#
define RAMDISKFILE "t1040rdb/ramdisk.uboot"
#
elif CONFIG_T1042RDB_PI
#
define FDTFILE "t1040rdb_pi/t1040rdb_pi.dtb"
#define
RAMDISKFILE "t1040rdb_pi/ramdisk.uboot
"
#
elif defined(CONFIG_T1042RDB_PI)
#
define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb"
#
elif defined(CONFIG_T1042RDB)
#define
FDTFILE "t1042rdb/t1042rdb.dtb
"
#endif
#ifdef CONFIG_FSL_DIU_FB
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录