minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-22 05:06:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

Browse Source
This commit is contained in:
Wolfgang Denk 2008-04-13 09:34:11 -07:00
commit 034a40f876
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/configs/canyonlands.h
View File

@ -330,19 +330,17 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\ "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
"net_nfs=tftp 200000 ${bootfile};" \ "net_nfs=tftp 400000 ${bootfile};" \
"run nfsargs addip addtty;" \
"bootm 200000\0" \
"net_nfs_fdt=tftp 200000 ${bootfile};" \
"tftp ${fdt_addr} ${fdt_file};" \ "tftp ${fdt_addr} ${fdt_file};" \
"run nfsargs addip addtty;" \ "run nfsargs addip addtty;" \
"bootm 200000 - ${fdt_addr}\0" \ "bootm 400000 - ${fdt_addr}\0" \
"net_nfs_fdt=net_nfs\0" \
"flash_nfs=run nfsargs addip addtty;" \ "flash_nfs=run nfsargs addip addtty;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip addtty;" \ "flash_self=run ramargs addip addtty;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"rootpath=/opt/eldk/ppc_4xxFP\0" \ "rootpath=/opt/eldk/ppc_4xxFP\0" \
"fdt_addr=400000\0" \ "fdt_addr=800000\0" \
"kernel_addr=fc000000\0" \ "kernel_addr=fc000000\0" \
"ramdisk_addr=fc200000\0" \ "ramdisk_addr=fc200000\0" \
"initrd_high=30000000\0" \ "initrd_high=30000000\0" \
@ -352,7 +350,7 @@
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load update\0" \ "upd=run load update\0" \
"nload=tftp 200000 ${hostname}/u-boot-nand.bin\0" \ "nload=tftp 200000 ${hostname}/u-boot-nand.bin\0" \
"nupdate=nand erase 0 60000;nand write 200000 0 60000;" \ "nupdate=nand erase 0 100000;nand write 200000 0 100000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"nupd=run nload nupdate\0" \ "nupd=run nload nupdate\0" \
"pciconfighost=1\0" \ "pciconfighost=1\0" \

27
include/configs/kilauea.h
View File

@ -243,22 +243,27 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\ "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
"net_nfs=tftp 200000 ${bootfile};" \ "flash_self_old=run ramargs addip addtty;" \
"run nfsargs addip addtty;" \
"bootm 200000\0" \
"net_nfs_fdt=tftp 200000 ${bootfile};" \
"tftp ${fdt_addr} ${fdt_file};" \
"run nfsargs addip addtty;" \
"bootm 200000 - ${fdt_addr}\0" \
"flash_nfs=run nfsargs addip addtty;" \
"bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip addtty;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_self=run ramargs addip addtty;" \
"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"flash_nfs_old=run nfsargs addip addtty;" \
"bootm ${kernel_addr}\0" \
"flash_nfs=run nfsargs addip addtty;" \
"bootm ${kernel_addr} - ${fdt_addr}\0" \
"net_nfs_old=tftp ${kernel_addr_r} ${bootfile};" \
"run nfsargs addip addtty;bootm ${kernel_addr_r}\0" \
"net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \
"tftp ${fdt_addr_r} ${fdt_file}; " \
"run nfsargs addip addtty;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"rootpath=/opt/eldk/ppc_4xx\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=kilauea/uImage\0" \ "bootfile=kilauea/uImage\0" \
"fdt_file=kilauea/kilauea.dtb\0" \ "fdt_file=kilauea/kilauea.dtb\0" \
"fdt_addr=400000\0" \ "kernel_addr_r=400000\0" \
"fdt_addr_r=800000\0" \
"kernel_addr=fc000000\0" \ "kernel_addr=fc000000\0" \
"fdt_addr=fc1e0000\0" \
"ramdisk_addr=fc200000\0" \ "ramdisk_addr=fc200000\0" \
"initrd_high=30000000\0" \ "initrd_high=30000000\0" \
"load=tftp 200000 kilauea/u-boot.bin\0" \ "load=tftp 200000 kilauea/u-boot.bin\0" \

9
include/ppc440.h
View File

@ -1731,17 +1731,10 @@
#else #else
#define CNTRL_DCR_BASE 0x0b0 #define CNTRL_DCR_BASE 0x0b0
#endif #endif
#if defined(CONFIG_440GX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT)
#define cpc0_er (CNTRL_DCR_BASE+0x00) /* CPM enable register */ #define cpc0_er (CNTRL_DCR_BASE+0x00) /* CPM enable register */
#define cpc0_fr (CNTRL_DCR_BASE+0x01) /* CPM force register */ #define cpc0_fr (CNTRL_DCR_BASE+0x01) /* CPM force register */
#define cpc0_sr (CNTRL_DCR_BASE+0x02) /* CPM status register */ #define cpc0_sr (CNTRL_DCR_BASE+0x02) /* CPM status register */
#else
#define cpc0_sr (CNTRL_DCR_BASE+0x00) /* CPM status register */
#define cpc0_er (CNTRL_DCR_BASE+0x01) /* CPM enable register */
#define cpc0_fr (CNTRL_DCR_BASE+0x02) /* CPM force register */
#endif
#define cpc0_sys0 (CNTRL_DCR_BASE+0x30) /* System configuration reg 0 */ #define cpc0_sys0 (CNTRL_DCR_BASE+0x30) /* System configuration reg 0 */
#define cpc0_sys1 (CNTRL_DCR_BASE+0x31) /* System configuration reg 1 */ #define cpc0_sys1 (CNTRL_DCR_BASE+0x31) /* System configuration reg 1 */

2
lib_ppc/board.c
View File

@ -440,7 +440,7 @@ void board_init_f (ulong bootflag)
* - monitor code * - monitor code
* - board info struct * - board info struct
*/ */
len = (ulong)&_end - (ulong)&_start + EXC_OFF_SYS_RESET; len = (ulong)&_end - CFG_MONITOR_BASE;
/* /*
* Subtract specified amount of memory to hide so that it won't * Subtract specified amount of memory to hide so that it won't