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

Update for MCC200 / PRS200 boards:

Browse Source 
- auto-adjust console device for Linux.
- fix typos.
This commit is contained in:
Wolfgang Denk 2006-08-25 01:38:04 +02:00
parent 15f29f06ed
commit 113f64e09a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -2,6 +2,10 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Update for MCC200 / PRS200 boards:
- auto-adjust console device for Linux.
- fix typos.
* Add a fix for a buggy USB device on the FO300 board. * Add a fix for a buggy USB device on the FO300 board.
* Updates for MCC200 / PRS200 boards: * Updates for MCC200 / PRS200 boards:

2
Makefile
View File

@ -327,6 +327,8 @@ mcc200_SDRAM_config \
mcc200_highboot_config \ mcc200_highboot_config \
mcc200_COM12_config \ mcc200_COM12_config \
mcc200_COM12_SDRAM_config \ mcc200_COM12_SDRAM_config \
mcc200_COM12_highboot_config \
mcc200_COM12_highboot_SDRAM_config \
mcc200_highboot_SDRAM_config \ mcc200_highboot_SDRAM_config \
prs200_config \ prs200_config \
prs200_DDR_config \ prs200_DDR_config \

6
include/configs/mcc200.h
View File

@ -120,8 +120,10 @@
#ifdef CONFIG_PRS200 #ifdef CONFIG_PRS200
# define CFG__BOARDNAME "prs200" # define CFG__BOARDNAME "prs200"
# define LINUX_CONSOLE "ttyS0"
#else #else
# define CFG__BOARDNAME "mcc200" # define CFG__BOARDNAME "mcc200"
# define LINUX_CONSOLE "ttyEU7"
#endif #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
@ -133,7 +135,7 @@
"addip=setenv bootargs ${bootargs} " \ "addip=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addcons=etenv bootargs ${bootargs} " \ "addcons=setenv bootargs ${bootargs} " \
"console=${console},${baudrate}\0" \ "console=${console},${baudrate}\0" \
"flash_nfs=run nfsargs addip addcons;" \ "flash_nfs=run nfsargs addip addcons;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
@ -141,7 +143,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};" \ "net_nfs=tftp 200000 ${bootfile};" \
"run nfsargs addip addcons;bootm\0" \ "run nfsargs addip addcons;bootm\0" \
"console=ttyS0\0" \ "console=" MK_STR(LINUX_CONSOLE) "\0" \
"rootpath=/opt/eldk/ppc_6xx\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \
"bootfile=/tftpboot/" CFG__BOARDNAME "/uImage\0" \ "bootfile=/tftpboot/" CFG__BOARDNAME "/uImage\0" \
"load=tftp 200000 /tftpboot/" CFG__BOARDNAME "/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/" CFG__BOARDNAME "/u-boot.bin\0" \