diff options
| author | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
| commit | a650cfa286e8933144a776693d56dfd858922aa4 (patch) | |
| tree | 1848c6ba3c8115b516d6711cad787d1e6a9d2fb5 /common | |
| parent | df02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff) | |
| parent | 0c32d96ddd7309b86ff92dfc1f3694908f174cf6 (diff) | |
| download | u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.zip u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.gz u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.bz2 | |
Merge with ssh://fifi/home/wd/git/u-boot/master
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 7 | ||||
| -rw-r--r-- | common/serial.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 41621ba..a415502 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -855,7 +855,7 @@ output_data_short(int dev, ulong *sect_buf, int words) /* We only need to swap data if we are running on a big endian cpu. */ /* But Au1x00 cpu:s already swaps data in big endian mode! */ -#if defined(__LITTLE_ENDIAN) || defined(CONFIG_AU1X00) +#if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) && !defined(CONFIG_GTH2) ) #define input_swap_data(x,y,z) input_data(x,y,z) #else static void @@ -881,8 +881,13 @@ input_swap_data(int dev, ulong *sect_buf, int words) debug("in input swap data base for read is %lx\n", (unsigned long) pbuf); while (words--) { +#ifdef __MIPS__ + *dbuf++ = swab16p((u16*)pbuf); + *dbuf++ = swab16p((u16*)pbuf); +#else *dbuf++ = ld_le16(pbuf); *dbuf++ = ld_le16(pbuf); +#endif /* !MIPS */ } #endif } diff --git a/common/serial.c b/common/serial.c index 2acbd08..7b29951 100644 --- a/common/serial.c +++ b/common/serial.c @@ -41,7 +41,7 @@ struct serial_device *default_serial_console (void) || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ - || defined(CONFIG_405EP) + || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) return &serial0_device; #else #error No default console @@ -75,7 +75,7 @@ void serial_initialize (void) #endif #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ - || defined(CONFIG_405EP) + || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) serial_register(&serial0_device); serial_register(&serial1_device); #endif |