Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
6b44466c
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,发现更多精彩内容 >>
提交
6b44466c
编写于
6月 20, 2007
作者:
S
Stefan Roese
浏览文件
操作
浏览文件
下载
差异文件
Merge with
git://www.denx.de/git/u-boot.git
上级
b3f9ec86
5ffa76a0
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
52 addition
and
16 deletion
+52
-16
board/tqm5200/tqm5200.c
board/tqm5200/tqm5200.c
+11
-0
common/cmd_flash.c
common/cmd_flash.c
+2
-2
common/cmd_ide.c
common/cmd_ide.c
+2
-2
common/cmd_misc.c
common/cmd_misc.c
+1
-1
common/cmd_pcmcia.c
common/cmd_pcmcia.c
+1
-1
common/main.c
common/main.c
+1
-1
cpu/ppc4xx/405gp_pci.c
cpu/ppc4xx/405gp_pci.c
+1
-1
include/configs/TQM5200.h
include/configs/TQM5200.h
+27
-3
include/configs/sc3.h
include/configs/sc3.h
+3
-2
lib_ppc/board.c
lib_ppc/board.c
+3
-3
未找到文件。
board/tqm5200/tqm5200.c
浏览文件 @
6b44466c
...
...
@@ -32,6 +32,10 @@
#include <pci.h>
#include <asm/processor.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif
#ifdef CONFIG_VIDEO_SM501
#include <sm501.h>
#endif
...
...
@@ -775,3 +779,10 @@ int board_get_height (void)
}
#endif
/* CONFIG_VIDEO_SM501 */
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
void
ft_board_setup
(
void
*
blob
,
bd_t
*
bd
)
{
ft_cpu_setup
(
blob
,
bd
);
}
#endif
/* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */
common/cmd_flash.c
浏览文件 @
6b44466c
...
...
@@ -690,7 +690,7 @@ U_BOOT_CMD(
);
U_BOOT_CMD
(
erase
,
3
,
1
,
do_flerase
,
erase
,
3
,
0
,
do_flerase
,
"erase - erase FLASH memory
\n
"
,
"start end
\n
"
" - erase FLASH from addr 'start' to addr 'end'
\n
"
...
...
@@ -704,7 +704,7 @@ U_BOOT_CMD(
);
U_BOOT_CMD
(
protect
,
4
,
1
,
do_protect
,
protect
,
4
,
0
,
do_protect
,
"protect - enable or disable FLASH write protection
\n
"
,
"on start end
\n
"
" - protect FLASH from addr 'start' to addr 'end'
\n
"
...
...
common/cmd_ide.c
浏览文件 @
6b44466c
...
...
@@ -514,11 +514,11 @@ void ide_init (void)
unsigned
char
c
;
int
i
,
bus
;
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
unsigned
int
ata_reset_time
;
unsigned
int
ata_reset_time
=
ATA_RESET_TIME
;
char
*
s
;
#endif
#ifdef CONFIG_AMIGAONEG3SE
unsigned
int
max_bus_scan
;
char
*
s
;
#endif
#ifdef CONFIG_IDE_8xx_PCCARD
extern
int
pcmcia_on
(
void
);
...
...
common/cmd_misc.c
浏览文件 @
6b44466c
...
...
@@ -63,7 +63,7 @@ U_BOOT_CMD(
#endif
/* CONFIG_COMMANDS & CFG_CMD_IRQ */
U_BOOT_CMD
(
sleep
,
2
,
2
,
do_sleep
,
sleep
,
2
,
1
,
do_sleep
,
"sleep - delay execution for some time
\n
"
,
"N
\n
"
" - delay execution for N seconds (N is _decimal_ !!!)
\n
"
...
...
common/cmd_pcmcia.c
浏览文件 @
6b44466c
...
...
@@ -87,7 +87,7 @@ int do_pinit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
U_BOOT_CMD
(
pinit
,
2
,
1
,
do_pinit
,
pinit
,
2
,
0
,
do_pinit
,
"pinit - PCMCIA sub-system
\n
"
,
"on - power on PCMCIA socket
\n
"
"pinit off - power off PCMCIA socket
\n
"
...
...
common/main.c
浏览文件 @
6b44466c
...
...
@@ -1336,7 +1336,7 @@ int run_command (const char *cmd, int flag)
/* Did the user stop this? */
if
(
had_ctrlc
())
return
0
;
/* if stopped then not repeatable */
return
-
1
;
/* if stopped then not repeatable */
}
return
rc
?
rc
:
repeatable
;
...
...
cpu/ppc4xx/405gp_pci.c
浏览文件 @
6b44466c
...
...
@@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev,
pci_hose_write_config_dword
(
hose
,
dev
,
PCI_COMMAND
,
cmdstat
);
}
#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_S
OLIDCARD
3))
#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_S
C
3))
/*
*As is these functs get called out of flash Not a horrible
...
...
include/configs/TQM5200.h
浏览文件 @
6b44466c
...
...
@@ -234,6 +234,8 @@
#ifndef CONFIG_CAM5200
#define CUSTOM_ENV_SETTINGS \
"bootfile=/tftpboot/tqm5200/uImage\0" \
"bootfile_fdt=/tftpboot/tqm5200/uImage_fdt\0" \
"fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0" \
"u-boot=/tftpboot/tqm5200/u-boot.bin\0"
#else
#define CUSTOM_ENV_SETTINGS \
...
...
@@ -243,6 +245,10 @@
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttyS0\0" \
"kernel_addr=200000\0" \
"fdt_addr=400000\0" \
"hostname=tqm5200\0" \
"netdev=eth0\0" \
"rootpath=/opt/eldk/ppc_6xx\0" \
"ramargs=setenv bootargs root=/dev/ram rw\0" \
...
...
@@ -252,13 +258,17 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \
"addcons=setenv bootargs ${bootargs} " \
"console=
ttyS0,${baudrate}\0"
\
"console=
${console},${baudrate}\0"
\
"flash_self=run ramargs addip addcons;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip addcons;" \
"bootm ${kernel_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;" \
"bootm\0" \
"net_nfs=tftp ${kernel_addr} ${bootfile};" \
"run nfsargs addip addcons;bootm\0" \
"net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt};" \
"tftp ${fdt_addr} ${fdt_file};setenv console ttyPSC0;" \
"run nfsargs addip addcons;" \
"bootm ${kernel_addr} - ${fdt_addr}\0" \
CUSTOM_ENV_SETTINGS \
"load=tftp 200000 ${u-boot}\0" \
ENV_UPDT \
...
...
@@ -676,4 +686,18 @@
/* Interval between registers */
#define CFG_ATA_STRIDE 4
/*-----------------------------------------------------------------------
* Open firmware flat tree support
*-----------------------------------------------------------------------
*/
#define CONFIG_OF_FLAT_TREE 1
#define CONFIG_OF_BOARD_SETUP 1
/* maximum size of the flat tree (8K) */
#define OF_FLAT_TREE_MAX_SIZE 8192
#define OF_CPU "PowerPC,5200@0"
#define OF_SOC "soc5200@f0000000"
#define OF_TBCLK (bd->bi_busfreq / 4)
#define OF_STDOUT_PATH "/soc5200@f0000000/serial@2000"
#endif
/* __CONFIG_H */
include/configs/sc3.h
浏览文件 @
6b44466c
...
...
@@ -58,7 +58,7 @@
* 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB)
*/
#define CONFIG_S
OLIDCARD
3 1
#define CONFIG_S
C
3 1
#define CONFIG_4xx 1
#define CONFIG_405GP 1
...
...
@@ -134,7 +134,8 @@
#if 1
/* feel free to disable for development */
#define CONFIG_AUTOBOOT_KEYED
/* Enable password protection */
#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n"
#define CONFIG_AUTOBOOT_DELAY_STR "\n"
/* 1st "password" */
#define CONFIG_AUTOBOOT_DELAY_STR "\r"
/* 1st "password" */
#define CONFIG_AUTOBOOT_DELAY_STR2 "\n"
/* 1st "password" */
#endif
/*
...
...
lib_ppc/board.c
浏览文件 @
6b44466c
...
...
@@ -76,7 +76,7 @@
extern
int
update_flash_size
(
int
flash_size
);
#endif
#if defined(CONFIG_S
OLIDCARD
3)
#if defined(CONFIG_S
C
3)
extern
void
sc3_read_eeprom
(
void
);
#endif
...
...
@@ -820,7 +820,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
/* CONFIG_405GP, CONFIG_405EP */
#endif
/* CFG_EXTBDINFO */
#if defined(CONFIG_S
OLIDCARD
3)
#if defined(CONFIG_S
C
3)
sc3_read_eeprom
();
#endif
s
=
getenv
(
"ethaddr"
);
...
...
@@ -929,7 +929,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
defined(CONFIG_S
OLIDCARD3)
|| \
defined(CONFIG_S
C3)
|| \
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录