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.)
---
 board/dbau1x00/dbau1x00.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'board/dbau1x00')

diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index 3b6fcec1c..8fcbd812a 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -39,6 +39,13 @@ long int initdram(int board_type)
 /* In cpu/mips/cpu.c */
 void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
+#ifdef CONFIG_DBAU1100
+#warning "FIXME Check that bcsr is the same as dbau1000 board!"
+#endif
+#ifdef CONFIG_DBAU1500
+#warning "FIXME Check that bcsr is the same as dbau1000 board!"
+#endif
+
 int checkboard (void)
 {
 	u16 status;
@@ -51,14 +58,24 @@ int checkboard (void)
 
 	proc_id = read_32bit_cp0_register(CP0_PRID);
 
-	switch(proc_id>>24){
+	switch (proc_id >> 24) {
 	case 0:
-	  puts("Board: Merlot (DbAu1000)\n");
-	  printf("CPU: Au1000 396 MHz, id: 0x%02x, rev: 0x%02x\n",
-		 (proc_id>>8)&0xFF,proc_id&0xFF);
-	  break;
+		puts ("Board: Merlot (DbAu1000)\n");
+		printf ("CPU: Au1000 396 MHz, id: 0x%02x, rev: 0x%02x\n",
+			(proc_id >> 8) & 0xFF, proc_id & 0xFF);
+		break;
+	case 1:
+		puts ("Board: DbAu1500\n");
+		printf ("CPU: Au1500, id: 0x%02x, rev: 0x%02x\n",
+			(proc_id >> 8) & 0xFF, proc_id & 0xFF);
+		break;
+	case 2:
+		puts ("Board: DbAu1100\n");
+		printf ("CPU: Au1100, id: 0x%02x, rev: 0x%02x\n",
+			(proc_id >> 8) & 0xFF, proc_id & 0xFF);
+		break;
 	default:
-	  printf("Unsupported cpu %d, proc_id=0x%x\n",proc_id>>24,proc_id);
+		printf ("Unsupported cpu %d, proc_id=0x%x\n", proc_id >> 24, proc_id);
 	}
 #ifdef CONFIG_IDE_PCMCIA
 	/* Enable 3.3 V on slot 0 ( VCC )
-- 
cgit v1.2.3