Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
334fb535
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,发现更多精彩内容 >>
提交
334fb535
编写于
3月 05, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git+ssh://10.10.0.7/home/wd/git/u-boot/master
上级
a4475386
6bc11388
变更
31
隐藏空白更改
内联
并排
Showing
31 changed file
with
26 addition
and
106 deletion
+26
-106
board/atum8548/atum8548.c
board/atum8548/atum8548.c
+1
-2
board/freescale/mpc8323erdb/mpc8323erdb.c
board/freescale/mpc8323erdb/mpc8323erdb.c
+0
-5
board/freescale/mpc832xemds/mpc832xemds.c
board/freescale/mpc832xemds/mpc832xemds.c
+0
-5
board/freescale/mpc8349emds/mpc8349emds.c
board/freescale/mpc8349emds/mpc8349emds.c
+1
-3
board/freescale/mpc8349itx/mpc8349itx.c
board/freescale/mpc8349itx/mpc8349itx.c
+0
-6
board/freescale/mpc8360emds/mpc8360emds.c
board/freescale/mpc8360emds/mpc8360emds.c
+0
-4
board/freescale/mpc8360erdk/mpc8360erdk.c
board/freescale/mpc8360erdk/mpc8360erdk.c
+0
-1
board/freescale/mpc837xemds/mpc837xemds.c
board/freescale/mpc837xemds/mpc837xemds.c
+0
-3
board/freescale/mpc837xerdb/mpc837xerdb.c
board/freescale/mpc837xerdb/mpc837xerdb.c
+0
-3
board/freescale/mpc8540ads/mpc8540ads.c
board/freescale/mpc8540ads/mpc8540ads.c
+1
-4
board/freescale/mpc8541cds/mpc8541cds.c
board/freescale/mpc8541cds/mpc8541cds.c
+1
-3
board/freescale/mpc8544ds/mpc8544ds.c
board/freescale/mpc8544ds/mpc8544ds.c
+1
-3
board/freescale/mpc8548cds/mpc8548cds.c
board/freescale/mpc8548cds/mpc8548cds.c
+1
-3
board/freescale/mpc8555cds/mpc8555cds.c
board/freescale/mpc8555cds/mpc8555cds.c
+1
-3
board/freescale/mpc8560ads/mpc8560ads.c
board/freescale/mpc8560ads/mpc8560ads.c
+1
-3
board/freescale/mpc8568mds/mpc8568mds.c
board/freescale/mpc8568mds/mpc8568mds.c
+1
-3
board/freescale/mpc8610hpcd/mpc8610hpcd.c
board/freescale/mpc8610hpcd/mpc8610hpcd.c
+1
-5
board/freescale/mpc8641hpcn/mpc8641hpcn.c
board/freescale/mpc8641hpcn/mpc8641hpcn.c
+1
-5
board/mpc8540eval/mpc8540eval.c
board/mpc8540eval/mpc8540eval.c
+2
-4
board/pm854/pm854.c
board/pm854/pm854.c
+1
-4
board/pm856/pm856.c
board/pm856/pm856.c
+2
-4
board/sbc8349/sbc8349.c
board/sbc8349/sbc8349.c
+1
-4
board/sbc8548/sbc8548.c
board/sbc8548/sbc8548.c
+1
-3
board/sbc8560/sbc8560.c
board/sbc8560/sbc8560.c
+2
-4
board/sbc8641d/sbc8641d.c
board/sbc8641d/sbc8641d.c
+1
-5
board/stxgp3/stxgp3.c
board/stxgp3/stxgp3.c
+1
-4
board/stxssa/stxssa.c
board/stxssa/stxssa.c
+1
-4
board/tqm834x/tqm834x.c
board/tqm834x/tqm834x.c
+0
-2
board/tqm85xx/sdram.c
board/tqm85xx/sdram.c
+0
-1
board/tqm85xx/tqm85xx.c
board/tqm85xx/tqm85xx.c
+0
-2
net/eth.c
net/eth.c
+3
-1
未找到文件。
board/atum8548/atum8548.c
浏览文件 @
334fb535
...
...
@@ -30,7 +30,7 @@
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/io.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -39,7 +39,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
long
int
fixed_sdram
(
void
);
int
board_early_init_f
(
void
)
...
...
board/freescale/mpc8323erdb/mpc8323erdb.c
浏览文件 @
334fb535
...
...
@@ -13,18 +13,13 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <command.h>
#include <libfdt.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
const
qe_iop_conf_t
qe_iop_conf_tab
[]
=
{
/* UCC3 */
...
...
board/freescale/mpc832xemds/mpc832xemds.c
浏览文件 @
334fb535
...
...
@@ -16,17 +16,12 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <command.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/freescale/mpc8349emds/mpc8349emds.c
浏览文件 @
334fb535
...
...
@@ -28,11 +28,9 @@
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spi.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/freescale/mpc8349itx/mpc8349itx.c
浏览文件 @
334fb535
...
...
@@ -24,19 +24,13 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#ifdef CONFIG_PCI
#include <asm/mpc8349_pci.h>
#include <pci.h>
#endif
#ifdef CONFIG_SPD_EEPROM
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/freescale/mpc8360emds/mpc8360emds.c
浏览文件 @
334fb535
...
...
@@ -15,16 +15,12 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/freescale/mpc8360erdk/mpc8360erdk.c
浏览文件 @
334fb535
...
...
@@ -18,7 +18,6 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <asm/io.h>
#include <asm/mmu.h>
...
...
board/freescale/mpc837xemds/mpc837xemds.c
浏览文件 @
334fb535
...
...
@@ -12,10 +12,7 @@
#include <common.h>
#include <i2c.h>
#include <spd.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/freescale/mpc837xerdb/mpc837xerdb.c
浏览文件 @
334fb535
...
...
@@ -14,11 +14,8 @@
#include <common.h>
#include <i2c.h>
#include <spd.h>
#include <asm/io.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CFG_DRAM_TEST)
int
...
...
board/freescale/mpc8540ads/mpc8540ads.c
浏览文件 @
334fb535
...
...
@@ -29,7 +29,7 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -37,8 +37,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
@@ -73,7 +71,6 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
puts
(
"Initializing
\n
"
);
...
...
board/freescale/mpc8541cds/mpc8541cds.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -39,8 +39,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
...
...
board/freescale/mpc8544ds/mpc8544ds.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,7 @@
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/io.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -38,8 +38,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
sdram_init
(
void
);
int
board_early_init_f
(
void
)
...
...
board/freescale/mpc8548cds/mpc8548cds.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -42,8 +42,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
DECLARE_GLOBAL_DATA_PTR
;
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
...
...
board/freescale/mpc8555cds/mpc8555cds.c
浏览文件 @
334fb535
...
...
@@ -25,7 +25,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -37,8 +37,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
...
...
board/freescale/mpc8560ads/mpc8560ads.c
浏览文件 @
334fb535
...
...
@@ -30,7 +30,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -39,7 +39,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
...
...
@@ -275,7 +274,6 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
puts
(
"Initializing
\n
"
);
...
...
board/freescale/mpc8568mds/mpc8568mds.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <i2c.h>
#include <ioports.h>
#include <libfdt.h>
...
...
@@ -102,8 +102,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
...
...
board/freescale/mpc8610hpcd/mpc8610hpcd.c
浏览文件 @
334fb535
...
...
@@ -27,10 +27,10 @@
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <i2c.h>
#include <spd.h>
#include <asm/io.h>
#include <libfdt.h>
#include <fdt_support.h>
#include <spd_sdram.h>
#include "../common/pixis.h"
...
...
@@ -38,10 +38,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
void
mpc8610hpcd_diu_init
(
void
);
...
...
board/freescale/mpc8641hpcn/mpc8641hpcn.c
浏览文件 @
334fb535
...
...
@@ -25,7 +25,7 @@
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <asm/io.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -36,10 +36,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
board/mpc8540eval/mpc8540eval.c
浏览文件 @
334fb535
...
...
@@ -26,9 +26,7 @@
#include <common.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
extern
long
int
spd_sdram
(
void
);
#include <spd_sdram.h>
long
int
fixed_sdram
(
void
);
...
...
@@ -66,7 +64,7 @@ int checkboard (void)
long
int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
#if !defined(CONFIG_RAM_AS_FLASH)
volatile
ccsr_lbc_t
*
lbc
=
(
void
*
)(
CFG_MPC85xx_LBC_ADDR
);
sys_info_t
sysinfo
;
...
...
board/pm854/pm854.c
浏览文件 @
334fb535
...
...
@@ -29,14 +29,12 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
#include <spd
_sdram
.h>
#if defined(CONFIG_DDR_ECC)
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
@@ -77,7 +75,6 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
puts
(
"Initializing
\n
"
);
...
...
board/pm856/pm856.c
浏览文件 @
334fb535
...
...
@@ -30,15 +30,13 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#if defined(CONFIG_DDR_ECC)
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
@@ -231,7 +229,7 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
puts
(
"Initializing
\n
"
);
...
...
board/sbc8349/sbc8349.c
浏览文件 @
334fb535
...
...
@@ -30,11 +30,8 @@
#include <mpc83xx.h>
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#
endif
#
include <miiphy.h>
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif
...
...
board/sbc8548/sbc8548.c
浏览文件 @
334fb535
...
...
@@ -30,7 +30,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -41,8 +41,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
DECLARE_GLOBAL_DATA_PTR
;
extern
long
int
spd_sdram
(
void
);
void
local_bus_init
(
void
);
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
board/sbc8560/sbc8560.c
浏览文件 @
334fb535
...
...
@@ -27,13 +27,11 @@
*/
extern
long
int
spd_sdram
(
void
);
#include <common.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
long
int
fixed_sdram
(
void
);
...
...
@@ -262,7 +260,7 @@ int checkboard (void)
long
int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
#if 0
#if !defined(CONFIG_RAM_AS_FLASH)
volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);
...
...
board/sbc8641d/sbc8641d.c
浏览文件 @
334fb535
...
...
@@ -34,7 +34,7 @@
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <libfdt.h>
#include <fdt_support.h>
...
...
@@ -42,10 +42,6 @@
extern
void
ddr_enable_ecc
(
unsigned
int
dram_size
);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void
sdram_init
(
void
);
long
int
fixed_sdram
(
void
);
...
...
board/stxgp3/stxgp3.c
浏览文件 @
334fb535
...
...
@@ -29,15 +29,13 @@
*/
extern
long
int
spd_sdram
(
void
);
#include <common.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <asm/io.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
long
int
fixed_sdram
(
void
);
...
...
@@ -281,7 +279,6 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
#if defined(CONFIG_DDR_DLL)
{
...
...
board/stxssa/stxssa.c
浏览文件 @
334fb535
...
...
@@ -29,15 +29,13 @@
*/
extern
long
int
spd_sdram
(
void
);
#include <common.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <asm/io.h>
#include <spd.h>
#include <spd
_sdram
.h>
#include <miiphy.h>
long
int
fixed_sdram
(
void
);
...
...
@@ -297,7 +295,6 @@ long int
initdram
(
int
board_type
)
{
long
dram_size
=
0
;
extern
long
spd_sdram
(
void
);
#if defined(CONFIG_DDR_DLL)
{
...
...
board/tqm834x/tqm834x.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,6 @@
#include <mpc83xx.h>
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <asm-ppc/mmu.h>
#include <pci.h>
...
...
@@ -59,7 +58,6 @@ int tqm834x_num_flash_banks;
/* External definitions */
ulong
flash_get_size
(
ulong
base
,
int
banknum
);
extern
flash_info_t
flash_info
[];
extern
long
spd_sdram
(
void
);
/* Local functions */
static
int
detect_num_flash_banks
(
void
);
...
...
board/tqm85xx/sdram.c
浏览文件 @
334fb535
...
...
@@ -27,7 +27,6 @@
#include <asm/immap_85xx.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <spd.h>
struct
sdram_conf_s
{
unsigned
long
size
;
...
...
board/tqm85xx/tqm85xx.c
浏览文件 @
334fb535
...
...
@@ -32,7 +32,6 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <flash.h>
DECLARE_GLOBAL_DATA_PTR
;
...
...
@@ -40,7 +39,6 @@ DECLARE_GLOBAL_DATA_PTR;
extern
flash_info_t
flash_info
[];
/* FLASH chips info */
void
local_bus_init
(
void
);
long
int
fixed_sdram
(
void
);
ulong
flash_get_size
(
ulong
base
,
int
banknum
);
#ifdef CONFIG_PS2MULT
...
...
net/eth.c
浏览文件 @
334fb535
...
...
@@ -441,8 +441,10 @@ int eth_init(bd_t *bis)
{
struct
eth_device
*
old_current
;
if
(
!
eth_current
)
if
(
!
eth_current
)
{
puts
(
"No ethernet found.
\n
"
);
return
-
1
;
}
old_current
=
eth_current
;
do
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录