diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-09 22:38:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-09 22:38:39 +0200 |
| commit | 2c4faea84f3d96d674e3c065e1f220b20c8930c0 (patch) | |
| tree | b454a86b87f4170245145fa2a38325ab6ec88f81 | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| parent | 9e04033d47410f888459458d5f35a0933584d7c8 (diff) | |
| download | u-boot-imx-2c4faea84f3d96d674e3c065e1f220b20c8930c0.zip u-boot-imx-2c4faea84f3d96d674e3c065e1f220b20c8930c0.tar.gz u-boot-imx-2c4faea84f3d96d674e3c065e1f220b20c8930c0.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
| -rw-r--r-- | include/configs/MPC8349ITX.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 121ff06..44649d0 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -289,6 +289,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CFG_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} +#define CONFIG_CONSOLE ttyS0 #define CONFIG_BAUDRATE 115200 #define CFG_NS16550_COM1 (CFG_IMMR + 0x4500) @@ -408,6 +409,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH /* Flash is not usable now */ + #undef CFG_FLASH_CFI_DRIVER #define CFG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_SIZE 0x2000 @@ -450,9 +452,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_CMD_I2C #endif - /* Watchdog */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* @@ -673,9 +673,10 @@ boards, we say we have two, but don't display a message if we find only one. */ " ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":" \ MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \ MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \ - " console=ttyS0," MK_STR(CONFIG_BAUDRATE) + " console=" MK_STR(CONFIG_CONSOLE) "," MK_STR(CONFIG_BAUDRATE) #define CONFIG_EXTRA_ENV_SETTINGS \ + "console=" MK_STR(CONFIG_CONSOLE) "\0" \ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ |