diff options
| author | wdenk <wdenk> | 2004-12-31 09:32:47 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-12-31 09:32:47 +0000 |
| commit | e2ffd59b4d93c9149de1caaa087371b0cfc512c9 (patch) | |
| tree | 86cfb6e30bec1686253b0542d76f57c5d62d183a /common/cmd_ide.c | |
| parent | 400ab719c6025c176c50bcdff342384222d7424b (diff) | |
| download | u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.zip u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.gz u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.bz2 | |
* Code cleanup, mostly for GCC-3.3.x
* Cleanup confusing use of CONFIG_ETH*ADDR - ust his only to
pre-define a MAC address; use CONFIG_HAS_ETH* to enable support for
additional ethernet addresses.
* Cleanup drivers/i82365.c - avoid duplication of code
* Fix bogus "cannot span across banks" flash error message
* Add support for CompactFlash for the CPC45 Board.
Diffstat (limited to 'common/cmd_ide.c')
| -rw-r--r-- | common/cmd_ide.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 77a0494..851ba52 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2002 + * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -144,7 +144,7 @@ block_dev_desc_t ide_dev_desc[CFG_IDE_MAXDEVICE]; /* ------------------------------------------------------------------------- */ #ifdef CONFIG_IDE_LED -#if !defined(CONFIG_KUP4K) && !defined(CONFIG_KUP4X) &&!defined(CONFIG_BMS2003) +#if !defined(CONFIG_KUP4K) && !defined(CONFIG_KUP4X) &&!defined(CONFIG_BMS2003) &&!defined(CONFIG_CPC45) static void ide_led (uchar led, uchar status); #else extern void ide_led (uchar led, uchar status); @@ -1548,11 +1548,12 @@ static void ide_reset (void) /* ------------------------------------------------------------------------- */ -#if defined(CONFIG_IDE_LED) && \ - !defined(CONFIG_AMIGAONEG3SE) && \ - !defined(CONFIG_KUP4K) && \ - !defined(CONFIG_KUP4X) && \ - !defined(CONFIG_HMI10) +#if defined(CONFIG_IDE_LED) && \ + !defined(CONFIG_AMIGAONEG3SE)&& \ + !defined(CONFIG_CPC45) && \ + !defined(CONFIG_HMI10) && \ + !defined(CONFIG_KUP4K) && \ + !defined(CONFIG_KUP4X) static uchar led_buffer = 0; /* Buffer for current LED status */ @@ -1578,7 +1579,6 @@ static void ide_led (uchar led, uchar status) * ATAPI Support */ - #undef ATAPI_DEBUG #ifdef ATAPI_DEBUG @@ -1661,7 +1661,6 @@ output_data_shorts(int dev, ushort *sect_buf, int shorts) outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, shorts); } - static void input_data_shorts(int dev, ushort *sect_buf, int shorts) { |