diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/configs/mcc200.h | 6 |
3 files changed, 10 insertions, 2 deletions
@@ -2,6 +2,10 @@ 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. * Updates for MCC200 / PRS200 boards: @@ -327,6 +327,8 @@ mcc200_SDRAM_config \ mcc200_highboot_config \ mcc200_COM12_config \ mcc200_COM12_SDRAM_config \ +mcc200_COM12_highboot_config \ +mcc200_COM12_highboot_SDRAM_config \ mcc200_highboot_SDRAM_config \ prs200_config \ prs200_DDR_config \ diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index aead49a926..df3d68e9f7 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -120,8 +120,10 @@ #ifdef CONFIG_PRS200 # define CFG__BOARDNAME "prs200" +# define LINUX_CONSOLE "ttyS0" #else # define CFG__BOARDNAME "mcc200" +# define LINUX_CONSOLE "ttyEU7" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -133,7 +135,7 @@ "addip=setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ ":${hostname}:${netdev}:off panic=1\0" \ - "addcons=etenv bootargs ${bootargs} " \ + "addcons=setenv bootargs ${bootargs} " \ "console=${console},${baudrate}\0" \ "flash_nfs=run nfsargs addip addcons;" \ "bootm ${kernel_addr}\0" \ @@ -141,7 +143,7 @@ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};" \ "run nfsargs addip addcons;bootm\0" \ - "console=ttyS0\0" \ + "console=" MK_STR(LINUX_CONSOLE) "\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ "bootfile=/tftpboot/" CFG__BOARDNAME "/uImage\0" \ "load=tftp 200000 /tftpboot/" CFG__BOARDNAME "/u-boot.bin\0" \ |