From a2663ea4fc9d18cb8000c97ed92c3c668eda8e04 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 7 Dec 2003 18:32:37 +0000
Subject: * Patches by David Müller, 14 Nov 2003:   -
 board/mpl/common/common_util.c     * implement support for BZIP2 compressed
 images     * various cleanups (printf -> puts, ...)   -
 board/mpl/common/flash.c     * report correct errors to upper layers     *
 check the erase fail and VPP low bits in status reg   -
 board/mpl/vcma9/cmd_vcma9.c   - board/mpl/vcma9/flash.c     * various
 cleanups (printf -> puts, ...)   - common/cmd_usb.c     * fix typo in comment
   - cpu/arm920t/usb_ohci.c     * support for S3C2410 is missing in #if line  
 - drivers/cs8900.c     * reinit some registers in case of error (cable
 missing, ...)   - fs/fat/fat.c     * support for USB/MMC devices is missing
 in #if line   - include/configs/MIP405.h   - include/configs/PIP405.h     *
 enable BZIP2 support     * enlarge malloc space to 1MiB because of BZIP2
 support   - include/configs/VCMA9.h     * enable BZIP2 support     * enlarge
 malloc space to 1MiB because of BZIP2 support     * enable USB support   -
 lib_arm/armlinux.c     * change calling convention of ARM Linux kernel as    
   described on http://www.arm.linux.org.uk/developer/booting.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Patch by Thomas Lange, 14 Nov 2003:
  Split dbau1x00 into dbau1000, dbau1100 and dbau1500 configs to
  support all these AMD boards.

* Patch by Thomas Lange, 14 Nov 2003:
  Workaround for mips au1x00 physical memory accesses (the au1x00
  uses a 36 bit bus internally and cannot access physical memory
  directly. Use the uncached SDRAM address instead of the physical
  one.)
---
 cpu/arm920t/usb_ohci.c |  7 ++++++-
 cpu/mips/au1x00_eth.c  | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'cpu')

diff --git a/cpu/arm920t/usb_ohci.c b/cpu/arm920t/usb_ohci.c
index a040c137576..6f4a9f7ae9d 100644
--- a/cpu/arm920t/usb_ohci.c
+++ b/cpu/arm920t/usb_ohci.c
@@ -34,11 +34,16 @@
  */
 
 #include <common.h>
-/* #include <pci.h> no PCI on the S3C2400 */
+/* #include <pci.h> no PCI on the S3C24X0 */
 
 #ifdef CONFIG_USB_OHCI
 
+#if defined(CONFIG_S3C2400)
 #include <s3c2400.h>
+#elif defined(CONFIG_S3C2410)
+#include <s3c2410.h>
+#endif
+
 #include <malloc.h>
 #include <usb.h>
 #include "usb_ohci.h"
diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index c23712b25fe..ae51b754a37 100644
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -31,12 +31,24 @@
 /* We all use switches, right? ;-) */
 #endif
 
+/* I assume ethernet behaves like au1000 */
+
 #ifdef CONFIG_AU1000
 /* Base address differ between cpu:s */
 #define ETH0_BASE AU1000_ETH0_BASE
 #define MAC0_ENABLE AU1000_MAC0_ENABLE
 #else
-#error "Au1100 and Au1500 not supported"
+#ifdef CONFIG_AU1100
+#define ETH0_BASE AU1100_ETH0_BASE
+#define MAC0_ENABLE AU1100_MAC0_ENABLE
+#else
+#ifdef CONFIG_AU1500
+#define ETH0_BASE AU1500_ETH0_BASE
+#define MAC0_ENABLE AU1500_MAC0_ENABLE
+#else
+#error "No valid cpu set"
+#endif
+#endif
 #endif
 
 #include <common.h>
@@ -175,6 +187,7 @@ static int au1x00_init(struct eth_device* dev, bd_t * bd){
 	}
 
 	/* Put mac addr in little endian */
+	/* FIXME Check this for little endian mode */
 #define ea eth_get_dev()->enetaddr
 	*mac_addr_high  =	(ea[5] <<  8) | (ea[4]	    ) ;
 	*mac_addr_low   =	(ea[3] << 24) | (ea[2] << 16) |
-- 
cgit v1.3.1