diff options
| author | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
| commit | 1d1ab638f8b5961e4972d29394e573afb39667be (patch) | |
| tree | 36fa9e8b01e05323e93a55a2cdc592fe69b5396c /cpu/mpc5xxx | |
| parent | 81b73dec16fd1227369a191e725e10044a9d56b8 (diff) | |
| parent | 60174746c668b309378a91488dded898e9553eae (diff) | |
| download | u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.zip u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.tar.gz u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mpc5xxx')
| -rw-r--r-- | cpu/mpc5xxx/ide.c | 8 | ||||
| -rw-r--r-- | cpu/mpc5xxx/usb.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/cpu/mpc5xxx/ide.c b/cpu/mpc5xxx/ide.c index 087ddac..df5b4ac 100644 --- a/cpu/mpc5xxx/ide.c +++ b/cpu/mpc5xxx/ide.c @@ -54,11 +54,19 @@ int ide_preinit (void) /* All sample codes do that... */ *(vu_long *) MPC5XXX_ATA_SHARE_COUNT = 0; +#if defined(CONFIG_UC101) + /* Configure and reset host */ + *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = + MPC5xxx_ATA_HOSTCONF_SMR | MPC5xxx_ATA_HOSTCONF_FR; + udelay (10); + *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = 0; +#else /* Configure and reset host */ *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = MPC5xxx_ATA_HOSTCONF_IORDY | MPC5xxx_ATA_HOSTCONF_SMR | MPC5xxx_ATA_HOSTCONF_FR; udelay (10); *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = MPC5xxx_ATA_HOSTCONF_IORDY; +#endif /* Disable prefetch on Commbus */ psdma->PtdCntrl |= 1; diff --git a/cpu/mpc5xxx/usb.c b/cpu/mpc5xxx/usb.c index ce709fc..ed467ab 100644 --- a/cpu/mpc5xxx/usb.c +++ b/cpu/mpc5xxx/usb.c @@ -27,7 +27,7 @@ #include <mpc5xxx.h> -int usb_cpu_init() +int usb_cpu_init(void) { /* Set the USB Clock */ *(vu_long *)MPC5XXX_CDM_48_FDC = CONFIG_USB_CLOCK; @@ -41,12 +41,12 @@ int usb_cpu_init() return 0; } -int usb_cpu_stop() +int usb_cpu_stop(void) { return 0; } -int usb_cpu_init_fail() +int usb_cpu_init_fail(void) { return 0; } |