diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
| commit | cbf9c117282b8729bdb86071997b58fcab58c444 (patch) | |
| tree | ff9175f1d987c49ef8b3b334bffae4f35ca8b759 /board | |
| parent | a99a0a98b9fcf78ee2ceda893e8d4bd9b11e427a (diff) | |
| parent | 2c61f14c60ccc5a1c90205991bf555872887a831 (diff) | |
| download | u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.zip u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.gz u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/yellowstone/flash.c | 3 | ||||
| -rw-r--r-- | board/amcc/yellowstone/yellowstone.c | 4 | ||||
| -rw-r--r-- | board/mpl/common/usb_uhci.c | 24 |
3 files changed, 22 insertions, 9 deletions
diff --git a/board/amcc/yellowstone/flash.c b/board/amcc/yellowstone/flash.c index 99fcfb5..cd6a2e6 100644 --- a/board/amcc/yellowstone/flash.c +++ b/board/amcc/yellowstone/flash.c @@ -329,7 +329,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *) (info->start[0]); volatile FLASH_WORD_SIZE *addr2; int flag, prot, sect, l_sect; - int i; if ((s_first < 0) || (s_first > s_last)) { if (info->flash_id == FLASH_UNKNOWN) { @@ -517,7 +516,7 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) */ static int write_word(flash_info_t * info, ulong dest, ulong data) { - volatile vu_long *addr2 = (vu_long *) (info->start[0]); + vu_long *addr2 = (vu_long *) (info->start[0]); volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *) dest; volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *) & data; ulong start; diff --git a/board/amcc/yellowstone/yellowstone.c b/board/amcc/yellowstone/yellowstone.c index 840a46c..a6b81e6 100644 --- a/board/amcc/yellowstone/yellowstone.c +++ b/board/amcc/yellowstone/yellowstone.c @@ -315,10 +315,6 @@ int pci_pre_init(struct pci_controller *hose) #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT) void pci_target_init(struct pci_controller *hose) { - u16 cmdstat; - - DECLARE_GLOBAL_DATA_PTR; - /*--------------------------------------------------------------------------+ * Set up Direct MMIO registers *--------------------------------------------------------------------------*/ diff --git a/board/mpl/common/usb_uhci.c b/board/mpl/common/usb_uhci.c index 4a10b79..84c91c4 100644 --- a/board/mpl/common/usb_uhci.c +++ b/board/mpl/common/usb_uhci.c @@ -1,6 +1,25 @@ /* - * (C) Copyright 2001 - * Denis Peter, MPL AG Switzerland + * Part of this code has been derived from linux: + * Universal Host Controller Interface driver for USB (take II). + * + * (c) 1999-2001 Georg Acher, acher@in.tum.de (executive slave) (base guitar) + * Deti Fliegl, deti@fliegl.de (executive slave) (lead voice) + * Thomas Sailer, sailer@ife.ee.ethz.ch (chief consultant) (cheer leader) + * Roman Weissgaerber, weissg@vienna.at (virt root hub) (studio porter) + * (c) 2000 Yggdrasil Computing, Inc. (port of new PCI interface support + * from usb-ohci.c by Adam Richter, adam@yggdrasil.com). + * (C) 2000 David Brownell, david-b@pacbell.net (usb-ohci.c) + * + * HW-initalization based on material of + * + * (C) Copyright 1999 Linus Torvalds + * (C) Copyright 1999 Johannes Erdfelt + * (C) Copyright 1999 Randy Dunlap + * (C) Copyright 1999 Gregory P. Smith + * + * + * Adapted for U-Boot: + * (C) Copyright 2001 Denis Peter, MPL AG Switzerland * * See file CREDITS for list of people who contributed to this * project. @@ -20,7 +39,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Note: Part of this code has been derived from linux * */ |