Patch by Josef Wagner, 04 Jun 2004:

- DDR Ram support for PM520 (MPC5200)
- support for different flash types (PM520)
- USB / IDE / CF-Card / DiskOnChip support for PM520
- 8 bit boot rom support for PM520/CE520
- Add auto SDRAM module detection for MicroSys CPC45 board (MPC8245)
- I2C and RTC support for CPC45
- support of new flash type (28F160C3T) for CPC45

26 files changed, 1712 insertions, 1388 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f923382..de10941 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,12 +2,21 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Patch by Josef Wagner, 04 Jun 2004:
+  - DDR Ram support for PM520 (MPC5200)
+  - support for different flash types (PM520)
+  - USB / IDE / CF-Card / DiskOnChip support for PM520
+  - 8 bit boot rom support for PM520/CE520
+  - Add auto SDRAM module detection for MicroSys CPC45 board (MPC8245)
+  - I2C and RTC support for CPC45
+  - support of new flash type (28F160C3T) for CPC45
+
 * Fix flash parameters passed to Linux for PPChameleon board
 
 * Remove eth_init() from lib_arm/board.c; it's done in net.net.c.
 
 * Patch by Paul Ruhland, 10 Jun 2004:
-  fix support for Logic SDK-LH7A404 board and clean up the 
+  fix support for Logic SDK-LH7A404 board and clean up the
   LH7A404 register macros.
 
 * Patch by Matthew McClintock, 10 Jun 2004:
diff --git a/CREDITS b/CREDITS
index 8f0057c..dcd2906 100644
--- a/CREDITS
+++ b/CREDITS
@@ -362,7 +362,7 @@ D: Port to MPC555/556 microcontrollers and support for cmi board
 
 N: Ming-Len Wu
 E: minglen_wu@techware.com.tw
-D: Motorola MX1ADS board support 
+D: Motorola MX1ADS board support
 W: http://www.techware.com.tw/
 
 N: Xianghua Xiao
diff --git a/Makefile b/Makefile
index 7fcf064..d8b8c7b 100644
--- a/Makefile
+++ b/Makefile
@@ -255,8 +255,20 @@ TOP5200_config:	unconfig
 	@ echo "#define CONFIG_$(@:_config=) 1"	>include/config.h
 	@./mkconfig -a TOP5200 ppc mpc5xxx top5200 emk
 
-PM520_config:	unconfig
-	@./mkconfig $(@:_config=) ppc mpc5xxx pm520
+PM520_config \
+PM520_DDR_config \
+PM520_ROMBOOT_config \
+PM520_ROMBOOT_DDR_config:	unconfig
+	@ >include/config.h
+	@[ -z "$(findstring DDR,$@)" ] || \
+		{ echo "#define CONFIG_MPC5200_DDR"	>>include/config.h ; \
+		  echo "... DDR memory revision" ; \
+		}
+	@[ -z "$(findstring ROMBOOT,$@)" ] || \
+		{ echo "#define CONFIG_BOOT_ROM" >>include/config.h ; \
+		  echo "... booting from 8-bit flash" ; \
+		}
+	@./mkconfig -a PM520 ppc mpc5xxx pm520
 
 #########################################################################
 ## MPC8xx Systems
diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c
index ad69245..92ccd42 100644
--- a/board/cpc45/cpc45.c
+++ b/board/cpc45/cpc45.c
@@ -25,6 +25,7 @@
 #include <mpc824x.h>
 #include <asm/processor.h>
 #include <pci.h>
+#include <i2c.h>
 
 int sysControlDisplay(int digit, uchar ascii_code);
 extern void Plx9030Init(void);
@@ -58,46 +59,134 @@ int checkboard(void)
 	return 0;
 }
 
-long int initdram(int board_type)
+long int initdram (int board_type)
 {
-	long size;
-	long new_bank0_end;
-	long mear1;
-	long emear1;
-
-	size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE);
-
-	new_bank0_end = size - 1;
-	mear1 = mpc824x_mpc107_getreg(MEAR1);
-	emear1 = mpc824x_mpc107_getreg(EMEAR1);
-	mear1 = (mear1  & 0xFFFFFF00) |
-		((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT);
-	emear1 = (emear1 & 0xFFFFFF00) |
-		((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT);
-	mpc824x_mpc107_setreg(MEAR1, mear1);
-	mpc824x_mpc107_setreg(EMEAR1, emear1);
-
-	return (size);
+	int m, row, col, bank, i, ref;
+	unsigned long start, end;
+	uint32_t mccr1, mccr2;
+	uint32_t mear1 = 0, emear1 = 0, msar1 = 0, emsar1 = 0;
+	uint32_t mear2 = 0, emear2 = 0, msar2 = 0, emsar2 = 0;
+	uint8_t mber = 0;
+	unsigned int tmp;
+
+	i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
+
+	if (i2c_reg_read (0x50, 2) != 0x04)
+		return 0;	/* Memory type */
+
+	m = i2c_reg_read (0x50, 5);	/* # of physical banks */
+	row = i2c_reg_read (0x50, 3);	/* # of rows */
+	col = i2c_reg_read (0x50, 4);	/* # of columns */
+	bank = i2c_reg_read (0x50, 17);	/* # of logical banks */
+	ref  = i2c_reg_read (0x50, 12);	/* refresh rate / type */
+
+	CONFIG_READ_WORD(MCCR1, mccr1);
+	mccr1 &= 0xffff0000;
+
+	CONFIG_READ_WORD(MCCR2, mccr2);
+	mccr2 &= 0xffff0000;
+
+	start = CFG_SDRAM_BASE;
+	end = start + (1 << (col + row + 3) ) * bank - 1;
+
+	for (i = 0; i < m; i++) {
+		mccr1 |= ((row == 13)? 2 : (bank == 4)? 0 : 3) << i * 2;
+		if (i < 4) {
+			msar1  |= ((start >> 20) & 0xff) << i * 8;
+			emsar1 |= ((start >> 28) & 0xff) << i * 8;
+			mear1  |= ((end >> 20) & 0xff) << i * 8;
+			emear1 |= ((end >> 28) & 0xff) << i * 8;
+		} else {
+			msar2  |= ((start >> 20) & 0xff) << (i-4) * 8;
+			emsar2 |= ((start >> 28) & 0xff) << (i-4) * 8;
+			mear2  |= ((end >> 20) & 0xff) << (i-4) * 8;
+			emear2 |= ((end >> 28) & 0xff) << (i-4) * 8;
+		}
+		mber |= 1 << i;
+		start += (1 << (col + row + 3) ) * bank;
+		end += (1 << (col + row + 3) ) * bank;
+	}
+	for (; i < 8; i++) {
+		if (i < 4) {
+			msar1  |= 0xff << i * 8;
+			emsar1 |= 0x30 << i * 8;
+			mear1  |= 0xff << i * 8;
+			emear1 |= 0x30 << i * 8;
+		} else {
+			msar2  |= 0xff << (i-4) * 8;
+			emsar2 |= 0x30 << (i-4) * 8;
+			mear2  |= 0xff << (i-4) * 8;
+			emear2 |= 0x30 << (i-4) * 8;
+		}
+	}
+
+	switch(ref) {
+		case 0x00:
+		case 0x80:
+			tmp = get_bus_freq(0) / 1000000 * 15625 / 1000 - 22;
+			break;
+		case 0x01:
+		case 0x81:
+			tmp = get_bus_freq(0) / 1000000 * 3900 / 1000 - 22;
+			break;
+		case 0x02:
+		case 0x82:
+			tmp = get_bus_freq(0) / 1000000 * 7800 / 1000 - 22;
+			break;
+		case 0x03:
+		case 0x83:
+			tmp = get_bus_freq(0) / 1000000 * 31300 / 1000 - 22;
+			break;
+		case 0x04:
+		case 0x84:
+			tmp = get_bus_freq(0) / 1000000 * 62500 / 1000 - 22;
+			break;
+		case 0x05:
+		case 0x85:
+			tmp = get_bus_freq(0) / 1000000 * 125000 / 1000 - 22;
+			break;
+		default:
+			tmp = 0x512;
+			break;
+	}
+
+	CONFIG_WRITE_WORD(MCCR1, mccr1);
+	CONFIG_WRITE_WORD(MCCR2, tmp << MCCR2_REFINT_SHIFT);
+	CONFIG_WRITE_WORD(MSAR1, msar1);
+	CONFIG_WRITE_WORD(EMSAR1, emsar1);
+	CONFIG_WRITE_WORD(MEAR1, mear1);
+	CONFIG_WRITE_WORD(EMEAR1, emear1);
+	CONFIG_WRITE_WORD(MSAR2, msar2);
+	CONFIG_WRITE_WORD(EMSAR2, emsar2);
+	CONFIG_WRITE_WORD(MEAR2, mear2);
+	CONFIG_WRITE_WORD(EMEAR2, emear2);
+	CONFIG_WRITE_BYTE(MBER, mber);
+
+	return (1 << (col + row + 3) ) * bank * m;
 }
 
+
 /*
  * Initialize PCI Devices, report devices found.
  */
-#ifndef CONFIG_PCI_PNP
 
-static struct pci_config_table pci_sandpoint_config_table[] = {
-	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, 0x0f, PCI_ANY_ID,
+static struct pci_config_table pci_cpc45_config_table[] = {
+#ifndef CONFIG_PCI_PNP
+	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, 0x0F, PCI_ANY_ID,
 	  pci_cfgfunc_config_device, { PCI_ENET0_IOADDR,
 				       PCI_ENET0_MEMADDR,
 				       PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER }},
+	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, 0x0D, PCI_ANY_ID,
+	  pci_cfgfunc_config_device, { PCI_PLX9030_IOADDR,
+				       PCI_PLX9030_MEMADDR,
+				       PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER }},
+#endif /*CONFIG_PCI_PNP*/
 	{ }
 };
-#endif
-
 
 struct pci_controller hose = {
 #ifndef CONFIG_PCI_PNP
-	config_table: pci_sandpoint_config_table,
+	config_table: pci_cpc45_config_table,
 #endif
 };
 
@@ -108,6 +197,9 @@ void pci_init_board(void)
 	/* init PCI_to_LOCAL Bus BRIDGE */
 	Plx9030Init();
 
+	/* Clear Display */
+	DISP_CWORD = 0x0;
+
 	sysControlDisplay(0,' ');
 	sysControlDisplay(1,'C');
 	sysControlDisplay(2,'P');
@@ -130,16 +222,14 @@ void pci_init_board(void)
 * RETURNS: NA
 */
 
-int sysControlDisplay
-    (
-    int digit, 			/* number of digit 0..7 */
-    uchar ascii_code		/* ASCII code */
-    )
+int sysControlDisplay (int digit,	/* number of digit 0..7 */
+		       uchar ascii_code	/* ASCII code */
+		      )
 {
 	if ((digit < 0) || (digit > 7))
 		return (-1);
 
-	*((volatile uchar*)(DISP_CHR_RAM + digit)) = ascii_code;
+	*((volatile uchar *) (DISP_CHR_RAM + digit)) = ascii_code;
 
 	return (0);
 }
diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c
index 9049235..37dd182 100644
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c
@@ -41,12 +41,12 @@
 #define MAIN_SECT_SIZE  0x40000
 #define PARAM_SECT_SIZE 0x8000
 
-flash_info_t    flash_info[CFG_MAX_FLASH_BANKS];
+flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
 
-static int write_data (flash_info_t *info, ulong dest, ulong *data);
-static void write_via_fpu(vu_long *addr, ulong *data);
-static __inline__ unsigned long get_msr(void);
-static __inline__ void set_msr(unsigned long msr);
+static int write_data (flash_info_t * info, ulong dest, ulong * data);
+static void write_via_fpu (vu_long * addr, ulong * data);
+static __inline__ unsigned long get_msr (void);
+static __inline__ void set_msr (unsigned long msr);
 
 /*---------------------------------------------------------------------*/
 #undef	DEBUG_FLASH
@@ -62,102 +62,132 @@ static __inline__ void set_msr(unsigned long msr);
 /*-----------------------------------------------------------------------
  */
 
-unsigned long flash_init(void)
+unsigned long flash_init (void)
 {
-    int i, j;
-    ulong size = 0;
-    uchar tempChar;
+	int i, j;
+	ulong size = 0;
+	uchar tempChar;
+	vu_long *tmpaddr;
 
-   /* Enable flash writes on CPC45 */
+	/* Enable flash writes on CPC45 */
 
-    tempChar = BOARD_CTRL;
+	tempChar = BOARD_CTRL;
 
-    tempChar |= (B_CTRL_FWPT_1 | B_CTRL_FWRE_1);
+	tempChar |= (B_CTRL_FWPT_1 | B_CTRL_FWRE_1);
 
-    tempChar &= ~(B_CTRL_FWPT_0 | B_CTRL_FWRE_0);
+	tempChar &= ~(B_CTRL_FWPT_0 | B_CTRL_FWRE_0);
 
-    BOARD_CTRL = tempChar;
+	BOARD_CTRL = tempChar;
 
+	__asm__ volatile ("sync\n eieio");
 
-    for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
-	vu_long *addr = (vu_long *)(CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
+	for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
+		vu_long *addr = (vu_long *) (CFG_FLASH_BASE + i * FLASH_BANK_SIZE);
 
-	addr[0] = 0x00900090;
+		addr[0] = 0x00900090;
 
-	DEBUGF ("Flash bank # %d:\n"
-		"\tManuf. ID @ 0x%08lX: 0x%08lX\n"
-		"\tDevice ID @ 0x%08lX: 0x%08lX\n",
-		i,
-		(ulong)(&addr[0]), addr[0],
-		(ulong)(&addr[2]), addr[2]);
+		__asm__ volatile ("sync\n eieio");
 
+		udelay (100);
 
-	if ((addr[0] == addr[1]) && (addr[0] == INTEL_MANUFACT) &&
-	    (addr[2] == addr[3]) && (addr[2] == INTEL_ID_28F160F3T))
-	{
+		DEBUGF ("Flash bank # %d:\n"
+			"\tManuf. ID @ 0x%08lX: 0x%08lX\n"
+			"\tDevice ID @ 0x%08lX: 0x%08lX\n",
+			i,
+			(ulong) (&addr[0]), addr[0],
+			(ulong) (&addr[2]), addr[2]);
 
-	    flash_info[i].flash_id = (FLASH_MAN_INTEL & FLASH_VENDMASK) |
-				     (INTEL_ID_28F160F3T & FLASH_TYPEMASK);
 
-	} else {
-	    flash_info[i].flash_id = FLASH_UNKNOWN;
-	    addr[0] = 0xFFFFFFFF;
-	    goto Done;
-	}
+		if ((addr[0] == addr[1]) && (addr[0] == INTEL_MANUFACT) &&
+		    (addr[2] == addr[3]) && (addr[2] == INTEL_ID_28F160F3T)) {
 
-	DEBUGF ("flash_id = 0x%08lX\n", flash_info[i].flash_id);
+			flash_info[i].flash_id =
+				(FLASH_MAN_INTEL & FLASH_VENDMASK) |
+				(INTEL_ID_28F160F3T & FLASH_TYPEMASK);
 
-	addr[0] = 0xFFFFFFFF;
+		} else if ((addr[0] == addr[1]) && (addr[0] == INTEL_MANUFACT)
+			 && (addr[2] == addr[3])
+			 && (addr[2] == INTEL_ID_28F160C3T)) {
+
+			flash_info[i].flash_id =
+				(FLASH_MAN_INTEL & FLASH_VENDMASK) |
+				(INTEL_ID_28F160C3T & FLASH_TYPEMASK);
 
-	flash_info[i].size = FLASH_BANK_SIZE;
-	flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
-	memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
-	for (j = 0; j < flash_info[i].sector_count; j++) {
-		if (j > 30) {
-			flash_info[i].start[j] = CFG_FLASH_BASE +
-						 i * FLASH_BANK_SIZE +
-						 (MAIN_SECT_SIZE * 31) + (j - 31) * PARAM_SECT_SIZE;
 		} else {
-			flash_info[i].start[j] = CFG_FLASH_BASE +
-						 i * FLASH_BANK_SIZE +
-						 j * MAIN_SECT_SIZE;
+			flash_info[i].flash_id = FLASH_UNKNOWN;
+			addr[0] = 0xFFFFFFFF;
+			goto Done;
+		}
+
+		DEBUGF ("flash_id = 0x%08lX\n", flash_info[i].flash_id);
+
+		addr[0] = 0xFFFFFFFF;
+
+		flash_info[i].size = FLASH_BANK_SIZE;
+		flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
+		memset (flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
+		for (j = 0; j < flash_info[i].sector_count; j++) {
+			if (j > 30) {
+				flash_info[i].start[j] = CFG_FLASH_BASE +
+					i * FLASH_BANK_SIZE +
+					(MAIN_SECT_SIZE * 31) + (j -
+								 31) *
+					PARAM_SECT_SIZE;
+			} else {
+				flash_info[i].start[j] = CFG_FLASH_BASE +
+					i * FLASH_BANK_SIZE +
+					j * MAIN_SECT_SIZE;
+			}
+		}
+
+		/* unlock sectors, if 160C3T */
+
+		for (j = 0; j < flash_info[i].sector_count; j++) {
+			tmpaddr = (vu_long *) flash_info[i].start[j];
+
+			if ((flash_info[i].flash_id & FLASH_TYPEMASK) ==
+			    (INTEL_ID_28F160C3T & FLASH_TYPEMASK)) {
+				tmpaddr[0] = 0x00600060;
+				tmpaddr[0] = 0x00D000D0;
+				tmpaddr[1] = 0x00600060;
+				tmpaddr[1] = 0x00D000D0;
+			}
 		}
+
+		size += flash_info[i].size;
+
+		addr[0] = 0x00FF00FF;
+		addr[1] = 0x00FF00FF;
 	}
-	size += flash_info[i].size;
-    }
 
-    /* Protect monitor and environment sectors
-     */
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+	/* Protect monitor and environment sectors
+	 */
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE + FLASH_BANK_SIZE
-    flash_protect(FLAG_PROTECT_SET,
-	      CFG_MONITOR_BASE,
-	      CFG_MONITOR_BASE + monitor_flash_len - 1,
-	      &flash_info[1]);
+	flash_protect (FLAG_PROTECT_SET,
+		       CFG_MONITOR_BASE,
+		       CFG_MONITOR_BASE + monitor_flash_len - 1,
+		       &flash_info[1]);
 #else
-    flash_protect(FLAG_PROTECT_SET,
-	      CFG_MONITOR_BASE,
-	      CFG_MONITOR_BASE + monitor_flash_len - 1,
-	      &flash_info[0]);
-#endif
+	flash_protect (FLAG_PROTECT_SET,
+		       CFG_MONITOR_BASE,
+		       CFG_MONITOR_BASE + monitor_flash_len - 1,
+		       &flash_info[0]);
 #endif
 
 #if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
-    flash_protect(FLAG_PROTECT_SET,
-	      CFG_ENV_ADDR,
-	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-	      &flash_info[1]);
+	flash_protect (FLAG_PROTECT_SET,
+		       CFG_ENV_ADDR,
+		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
 #else
-    flash_protect(FLAG_PROTECT_SET,
-	      CFG_ENV_ADDR,
-	      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-	      &flash_info[0]);
+	flash_protect (FLAG_PROTECT_SET,
+		       CFG_ENV_ADDR,
+		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
 #endif
 #endif
 
 Done:
-    return size;
+	return size;
 }
 
 /*-----------------------------------------------------------------------
@@ -179,6 +209,11 @@ void flash_print_info (flash_info_t * info)
 	case (INTEL_ID_28F160F3T & FLASH_TYPEMASK):
 		printf ("28F160F3T (16Mbit)\n");
 		break;
+
+	case (INTEL_ID_28F160C3T & FLASH_TYPEMASK):
+		printf ("28F160C3T (16Mbit)\n");
+		break;
+
 	default:
 		printf ("Unknown Chip Type 0x%04x\n", i);
 		goto Done;
@@ -186,7 +221,7 @@ void flash_print_info (flash_info_t * info)
 	}
 
 	printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
+		info->size >> 20, info->sector_count);
 
 	printf ("  Sector Start Addresses:");
 	for (i = 0; i < info->sector_count; i++) {
@@ -194,7 +229,7 @@ void flash_print_info (flash_info_t * info)
 			printf ("\n   ");
 		}
 		printf (" %08lX%s", info->start[i],
-				info->protect[i] ? " (RO)" : "     ");
+			info->protect[i] ? " (RO)" : "     ");
 	}
 	printf ("\n");
 
@@ -205,7 +240,7 @@ Done:
 /*-----------------------------------------------------------------------
  */
 
-int	flash_erase (flash_info_t *info, int s_first, int s_last)
+int flash_erase (flash_info_t * info, int s_first, int s_last)
 {
 	int flag, prot, sect;
 	ulong start, now, last;
@@ -229,33 +264,32 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)
 	}
 
 	prot = 0;
-	for (sect=s_first; sect<=s_last; ++sect) {
+	for (sect = s_first; sect <= s_last; ++sect) {
 		if (info->protect[sect]) {
 			prot++;
 		}
 	}
 
 	if (prot) {
-		printf ("- Warning: %d protected sectors will not be erased!\n",
-			prot);
+		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
 	} else {
 		printf ("\n");
 	}
 
 	start = get_timer (0);
-	last  = start;
+	last = start;
 	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect<=s_last; sect++) {
+	for (sect = s_first; sect <= s_last; sect++) {
 		if (info->protect[sect] == 0) {	/* not protected */
-			vu_long *addr = (vu_long *)(info->start[sect]);
+			vu_long *addr = (vu_long *) (info->start[sect]);
 
 			DEBUGF ("Erase sect %d @ 0x%08lX\n",
-				sect, (ulong)addr);
+				sect, (ulong) addr);
 
 			/* Disable interrupts which might cause a timeout
 			 * here.
 			 */
-			flag = disable_interrupts();
+			flag = disable_interrupts ();
 
 			addr[0] = 0x00500050;	/* clear status register */
 			addr[0] = 0x00200020;	/* erase setup */
@@ -267,23 +301,23 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)
 
 			/* re-enable interrupts if necessary */
 			if (flag)
-				enable_interrupts();
+				enable_interrupts ();
 
 			/* wait at least 80us - let's wait 1 ms */
 			udelay (1000);
 
 			while (((addr[0] & 0x00800080) != 0x00800080) ||
-			       ((addr[1] & 0x00800080) != 0x00800080) ) {
-				if ((now=get_timer(start)) >
-					   CFG_FLASH_ERASE_TOUT) {
+			       ((addr[1] & 0x00800080) != 0x00800080)) {
+				if ((now = get_timer (start)) >
+				    CFG_FLASH_ERASE_TOUT) {
 					printf ("Timeout\n");
-					addr[0] = 0x00B000B0; /* suspend erase */
-					addr[0] = 0x00FF00FF; /* to read mode  */
+					addr[0] = 0x00B000B0;	/* suspend erase */
+					addr[0] = 0x00FF00FF;	/* to read mode  */
 					return 1;
 				}
 
 				/* show that we're waiting */
-				if ((now - last) > 1000) {  /* every second  */
+				if ((now - last) > 1000) {	/* every second  */
 					putc ('.');
 					last = now;
 				}
@@ -306,7 +340,7 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)
 
 #define	FLASH_WIDTH	8	/* flash bus width in bytes */
 
-int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
+int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
 {
 	ulong wp, cp, msr;
 	int l, rc, i;
@@ -315,16 +349,16 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 	ulong *datal = &data[1];
 
 	DEBUGF ("Flash write_buff: @ 0x%08lx, src 0x%08lx len %ld\n",
-		addr, (ulong)src, cnt);
+		addr, (ulong) src, cnt);
 
 	if (info->flash_id == FLASH_UNKNOWN) {
 		return 4;
 	}
 
-	msr = get_msr();
-	set_msr(msr | MSR_FP);
+	msr = get_msr ();
+	set_msr (msr | MSR_FP);
 
-	wp = (addr & ~(FLASH_WIDTH-1));	/* get lower aligned address */
+	wp = (addr & ~(FLASH_WIDTH - 1));	/* get lower aligned address */
 
 	/*
 	 * handle unaligned start bytes
@@ -335,39 +369,35 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 		for (i = 0, cp = wp; i < l; i++, cp++) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-						((*datal & 0xFF000000) >> 24);
+					((*datal & 0xFF000000) >> 24);
 			}
 
-			*datal = (*datal << 8) | (*(uchar *)cp);
+			*datal = (*datal << 8) | (*(uchar *) cp);
 		}
 		for (; i < FLASH_WIDTH && cnt > 0; ++i) {
-			char tmp;
-
-			tmp = *src;
-
-			src++;
+			char tmp = *src++;
 
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-						((*datal & 0xFF000000) >> 24);
+					((*datal & 0xFF000000) >> 24);
 			}
 
 			*datal = (*datal << 8) | tmp;
-
-			--cnt; ++cp;
+			--cnt;
+			++cp;
 		}
 
 		for (; cnt == 0 && i < FLASH_WIDTH; ++i, ++cp) {
 			if (i >= 4) {
 				*datah = (*datah << 8) |
-						((*datal & 0xFF000000) >> 24);
+					((*datal & 0xFF000000) >> 24);
 			}
 
-			*datal = (*datah << 8) | (*(uchar *)cp);
+			*datal = (*datah << 8) | (*(uchar *) cp);
 		}
 
-		if ((rc = write_data(info, wp, data)) != 0) {
-			set_msr(msr);
+		if ((rc = write_data (info, wp, data)) != 0) {
+			set_msr (msr);
 			return (rc);
 		}
 
@@ -378,19 +408,19 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 	 * handle FLASH_WIDTH aligned part
 	 */
 	while (cnt >= FLASH_WIDTH) {
-		*datah = *(ulong *)src;
-		*datal = *(ulong *)(src + 4);
-		if ((rc = write_data(info, wp, data)) != 0) {
-			set_msr(msr);
+		*datah = *(ulong *) src;
+		*datal = *(ulong *) (src + 4);
+		if ((rc = write_data (info, wp, data)) != 0) {
+			set_msr (msr);
 			return (rc);
 		}
-		wp  += FLASH_WIDTH;
+		wp += FLASH_WIDTH;
 		cnt -= FLASH_WIDTH;
 		src += FLASH_WIDTH;
 	}
 
 	if (cnt == 0) {
-		set_msr(msr);
+		set_msr (msr);
 		return (0);
 	}
 
@@ -399,31 +429,28 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 	 */
 	*datah = *datal = 0;
 	for (i = 0, cp = wp; i < FLASH_WIDTH && cnt > 0; ++i, ++cp) {
-		char tmp;
-
-		tmp = *src;
-
-		src++;
+		char tmp = *src++;
 
 		if (i >= 4) {
-			*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
+			*datah = (*datah << 8) | ((*datal & 0xFF000000) >>
+						  24);
 		}
 
 		*datal = (*datal << 8) | tmp;
-
 		--cnt;
 	}
 
 	for (; i < FLASH_WIDTH; ++i, ++cp) {
 		if (i >= 4) {
-			*datah = (*datah << 8) | ((*datal & 0xFF000000) >> 24);
+			*datah = (*datah << 8) | ((*datal & 0xFF000000) >>
+						  24);
 		}
 
-		*datal = (*datal << 8) | (*(uchar *)cp);
+		*datal = (*datal << 8) | (*(uchar *) cp);
 	}
 
-	rc = write_data(info, wp, data);
-	set_msr(msr);
+	rc = write_data (info, wp, data);
+	set_msr (msr);
 
 	return (rc);
 }
@@ -434,32 +461,32 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
  * 1 - write timeout
  * 2 - Flash not erased
  */
-static int write_data (flash_info_t *info, ulong dest, ulong *data)
+static int write_data (flash_info_t * info, ulong dest, ulong * data)
 {
-	vu_long *addr = (vu_long *)dest;
+	vu_long *addr = (vu_long *) dest;
 	ulong start;
 	int flag;
 
 	/* Check if Flash is (sufficiently) erased */
 	if (((addr[0] & data[0]) != data[0]) ||
-	    ((addr[1] & data[1]) != data[1]) ) {
+	    ((addr[1] & data[1]) != data[1])) {
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts();
+	flag = disable_interrupts ();
 
-	addr[0] = 0x00400040;		/* write setup */
-	write_via_fpu(addr, data);
+	addr[0] = 0x00400040;	/* write setup */
+	write_via_fpu (addr, data);
 
 	/* re-enable interrupts if necessary */
 	if (flag)
-		enable_interrupts();
+		enable_interrupts ();
 
 	start = get_timer (0);
 
 	while (((addr[0] & 0x00800080) != 0x00800080) ||
-	       ((addr[1] & 0x00800080) != 0x00800080) ) {
-		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+	       ((addr[1] & 0x00800080) != 0x00800080)) {
+		if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
 			addr[0] = 0x00FF00FF;	/* restore read mode */
 			return (1);
 		}
@@ -472,22 +499,24 @@ static int write_data (flash_info_t *info, ulong dest, ulong *data)
 
 /*-----------------------------------------------------------------------
  */
-static void write_via_fpu(vu_long *addr, ulong *data)
+static void write_via_fpu (vu_long * addr, ulong * data)
 {
-	__asm__ __volatile__ ("lfd  1, 0(%0)" : : "r" (data));
-	__asm__ __volatile__ ("stfd 1, 0(%0)" : : "r" (addr));
+	__asm__ __volatile__ ("lfd  1, 0(%0)"::"r" (data));
+	__asm__ __volatile__ ("stfd 1, 0(%0)"::"r" (addr));
 }
+
 /*-----------------------------------------------------------------------
  */
-static __inline__ unsigned long get_msr(void)
+static __inline__ unsigned long get_msr (void)
 {
-    unsigned long msr;
+	unsigned long msr;
+
+	__asm__ __volatile__ ("mfmsr %0":"=r" (msr):);
 
-    __asm__ __volatile__ ("mfmsr %0" : "=r" (msr) :);
-    return msr;
+	return msr;
 }
 
-static __inline__ void set_msr(unsigned long msr)
+static __inline__ void set_msr (unsigned long msr)
 {
-    __asm__ __volatile__ ("mtmsr %0" : : "r" (msr));
+	__asm__ __volatile__ ("mtmsr %0"::"r" (msr));
 }
diff --git a/board/lpd7a40x/flash.c b/board/lpd7a40x/flash.c
index 26a9ce4..7b8e014 100644
--- a/board/lpd7a40x/flash.c
+++ b/board/lpd7a40x/flash.c
@@ -300,7 +300,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 			do {
 				ulong now;
 				/* check timeout */
-				//if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) {
+				/*if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { */
 				if ((now = get_timer(tstart)) > CFG_FLASH_ERASE_TOUT) {
 					printf("tstart = 0x%08lx, now = 0x%08lx\n", tstart, now);
 					*addr = CMD_STATUS_RESET;
diff --git a/board/mx1ads/Makefile b/board/mx1ads/Makefile
index 8a17702..72f850d 100644
--- a/board/mx1ads/Makefile
+++ b/board/mx1ads/Makefile
@@ -1,28 +1,26 @@
-#/*
-#* board/mx1ads/Makefile
-#* 
-#* (c) Copyright 2004
-#* Techware Information Technology, Inc.
-#* http://www.techware.com.tw/
-#*
-#* Ming-Len Wu <minglen_wu@techware.com.tw>
-#*
-#* This program is free software; you can redistribute it and/or
-#* modify it under the terms of the GNU General Public License as
-#* published by the Free Software Foundation; either version 2 of
-#* the License, or (at your option) any later version.
-#*
-#* This program is distributed in the hope that it will be useful,
-#* but WITHOUT ANY WARRANTY; without even the implied warranty of
-#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#* GNU General Public License for more details.
-#*
-#* You should have received a copy of the GNU General Public License
-#* along with this program; if not, write to the Free Software
-#* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#* MA 02111-1307 USA
-#*/
-
+#
+# board/mx1ads/Makefile
+#
+# (c) Copyright 2004
+# Techware Information Technology, Inc.
+# http://www.techware.com.tw/
+#
+# Ming-Len Wu <minglen_wu@techware.com.tw>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
 
 include $(TOPDIR)/config.mk
 
diff --git a/board/mx1ads/config.mk b/board/mx1ads/config.mk
index 16a0b84..f6ac40d 100644
--- a/board/mx1ads/config.mk
+++ b/board/mx1ads/config.mk
@@ -1,28 +1,25 @@
-#/*
-#* board/mx1ads/config.mk
-#* 
-#* (c) Copyright 2004
-#* Techware Information Technology, Inc.
-#* http://www.techware.com.tw/
-#*
-#* Ming-Len Wu <minglen_wu@techware.com.tw>
-#*
-#* This program is free software; you can redistribute it and/or
-#* modify it under the terms of the GNU General Public License as
-#* published by the Free Software Foundation; either version 2 of
-#* the License, or (at your option) any later version.
-#*
-#* This program is distributed in the hope that it will be useful,
-#* but WITHOUT ANY WARRANTY; without even the implied warranty of
-#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#* GNU General Public License for more details.
-#*
-#* You should have received a copy of the GNU General Public License
-#* along with this program; if not, write to the Free Software
-#* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#* MA 02111-1307 USA
-#*/
-
+#
+# board/mx1ads/config.mk
+#
+# (c) Copyright 2004
+# Techware Information Technology, Inc.
+# http://www.techware.com.tw/
+#
+# Ming-Len Wu <minglen_wu@techware.com.tw>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
 
 TEXT_BASE = 0x08400000
-
diff --git a/board/mx1ads/memsetup.S b/board/mx1ads/memsetup.S
index 39b71fe..1b06fa3 100644
--- a/board/mx1ads/memsetup.S
+++ b/board/mx1ads/memsetup.S
@@ -1,6 +1,6 @@
 /*
  * board/mx1ads/memsetup.S
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -49,7 +49,7 @@ memsetup:
 /* Issue Precharge All Commad		*/
 	ldr  r3, =0x8200000
 	ldr  r2, [r3]
-                                                                                                                                     
+
 /* Set AutoRefresh Command 		*/
 	ldr  r3, =0xA2120200
 	str  r3, [r1]
@@ -64,11 +64,11 @@ memsetup:
 	ldr  r2, [r3]
 	ldr  r2, [r3]
 	ldr  r2, [r3]
-                                                                                                                                     
+
 /* Set Mode Register 			*/
 	ldr  r3, =0xB2120200
 	str  r3, [r1]
-                                                                                                                                     
+
 /* Issue Mode Register Command		*/
 	ldr  r3, =0x08111800 	/* Mode Register Value 		*/
 	ldr  r2, [r3]
@@ -79,4 +79,3 @@ memsetup:
 
 /* everything is fine now 		*/
 	mov	pc, lr
-
diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c
index 567f88a..453e4bb 100644
--- a/board/mx1ads/mx1ads.c
+++ b/board/mx1ads/mx1ads.c
@@ -1,6 +1,6 @@
 /*
  * board/mx1ads/mx1ads.c
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -61,7 +61,7 @@ static inline void delay (unsigned long loops) {
 	  "bne 1b":"=r" (loops):"0" (loops));
 }
 
-#endif 
+#endif
 
 /*
  * Miscellaneous platform dependent initialisations
@@ -76,7 +76,7 @@ void SetAsynchMode(void) {
 		"mcr p15,0,r0,c1,c0,0 \n"
 	);
 }
-                                                
+
 static u32 mc9328sid;
 
 int board_init (void) {
@@ -88,16 +88,13 @@ int board_init (void) {
 	mc9328sid	= MX1_SIDR;
 
 	MX1_GPCR 	= 0x000003AB;		/* I/O pad driving strength 	*/
-	
+
 /*	MX1_CS1U 	= 0x00000A00;	*/	/* SRAM initialization 		*/
 /*	MX1_CS1L 	= 0x11110601; 	*/
-                        
 
 	MX1_MPCTL0 	= 0x04632410;	/* setting for 150 MHz MCU PLL CLK	*/
 
-/*	MX1_MPCTL0 	= 0x003f1437;	*//* setting for 192 MHz MCU PLL CLK	*/
-
-
+/*	MX1_MPCTL0 	= 0x003f1437;	*/ /* setting for 192 MHz MCU PLL CLK	*/
 
 /* set FCLK divider 1 (i.e. FCLK to MCU PLL CLK) and
  * BCLK divider to 2 (i.e. BCLK to 48 MHz)
@@ -108,13 +105,13 @@ int board_init (void) {
 	MX1_CSCR 	&= 0xFFFF7FFF;		/* Program PRESC bit(bit 15) to 0 to divide-by-1 */
 
 /* setup cs4 for cs8900 ethernet */
-	
+
 	MX1_CS4U	= 0x00000F00;	/* Initialize CS4 for CS8900 ethernet 	*/
 	MX1_CS4L	= 0x00001501;
-    
+
 	MX1_GIUS_A	&= 0xFF3FFFFF;
 	MX1_GPR_A	&= 0xFF3FFFFF;
-        
+
 	tmp = *(unsigned int *)(0x1500000C);
 	tmp = *(unsigned int *)(0x1500000C);
 
@@ -135,9 +132,9 @@ int board_init (void) {
 
 /* set PERCLKs				*/
 	MX1_PCDR = 0x00000055;     	/* set PERCLKS				*/
-	
-/* PERCLK3 is only used by SSI so the SSI driver can set it any value it likes 
- * PERCLK1 and PERCLK2 are shared so DO NOT change it in any other place       
+
+/* PERCLK3 is only used by SSI so the SSI driver can set it any value it likes
+ * PERCLK1 and PERCLK2 are shared so DO NOT change it in any other place
  * all sources selected as normal interrupt
  */
 	MX1_INTTYPEH = 0;
@@ -154,24 +151,24 @@ int board_late_init(void) {
 
 	switch	(mc9328sid) {
 		case 0x0005901d :
-			printf ("MX1ADS board with MC9328 MX1 (0L44N), Silicon ID 0x%08x \n\n",mc9328sid); 
+			printf ("MX1ADS board with MC9328 MX1 (0L44N), Silicon ID 0x%08x \n\n",mc9328sid);
 			break;
 		case 0x04d4c01d :
-			printf ("MX1ADS board with MC9328 MXL (1L45N), Silicon ID 0x%08x \n\n",mc9328sid); 
+			printf ("MX1ADS board with MC9328 MXL (1L45N), Silicon ID 0x%08x \n\n",mc9328sid);
 			break;
 		case 0x00d4c01d :
-			printf ("MX1ADS board with MC9328 MXL (2L45N), Silicon ID 0x%08x \n\n",mc9328sid); 
+			printf ("MX1ADS board with MC9328 MXL (2L45N), Silicon ID 0x%08x \n\n",mc9328sid);
 			break;
 
 		default :
-			printf ("MX1ADS board with UNKNOWN MC9328 cpu, Silicon ID 0x%08x \n",mc9328sid); 
+			printf ("MX1ADS board with UNKNOWN MC9328 cpu, Silicon ID 0x%08x \n",mc9328sid);
 			break;
-		
+
 	}
-	
+
 	return 0;
-} 
-                        
+}
+
 
 int dram_init (void) {
 	DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mx1ads/syncflash.c b/board/mx1ads/syncflash.c
index fc1d7f6..09fc0f8 100644
--- a/board/mx1ads/syncflash.c
+++ b/board/mx1ads/syncflash.c
@@ -1,6 +1,6 @@
 /*
  * board/mx1ads/syncflash.c
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -61,7 +61,7 @@ u32 SF_SR(void) {
 
 	reg_SFCTL	= CMD_PROGRAM;
 	tmp 		= __REG(CFG_FLASH_BASE);
-	
+
 	reg_SFCTL	= CMD_NORMAL;
 
 	reg_SFCTL	= CMD_LCR;			/* Activate LCR Mode 		*/
@@ -97,7 +97,7 @@ void SF_PrechargeAll(void) {
 	u32 tmp;
 
 	reg_SFCTL	= CMD_PREC;			/* Set Precharge Command 	*/
-	tmp 		= __REG(CFG_FLASH_BASE + SYNCFLASH_A10); /* Issue Precharge All Command */ 
+	tmp 		= __REG(CFG_FLASH_BASE + SYNCFLASH_A10); /* Issue Precharge All Command */
 
 }
 
@@ -105,7 +105,7 @@ void SF_PrechargeAll(void) {
 void SF_Normal(void) {
 
 	SF_PrechargeAll();
-	
+
 	reg_SFCTL	= CMD_NORMAL;
 }
 
@@ -118,10 +118,10 @@ void SF_Erase(u32 RowAddress) {
 
 	reg_SFCTL	= CMD_PREC;
 	tmp 		= __REG(RowAddress);
-	
+
 	reg_SFCTL 	= CMD_LCR;			/* Set LCR mode 		*/
 	__REG(RowAddress + LCR_ERASE_CONFIRM)	= 0;	/* Issue Erase Setup Command 	*/
-		
+
 	reg_SFCTL	= CMD_NORMAL;			/* return to Normal mode 	*/
 	__REG(RowAddress)	= 0xD0D0D0D0; 		/* Confirm			*/
 
@@ -134,7 +134,7 @@ void SF_NvmodeErase(void) {
 
 	reg_SFCTL	= CMD_LCR;			/* Set to LCR mode		*/
 	__REG(CFG_FLASH_BASE + LCR_ERASE_NVMODE)  = 0;	/* Issue Erase Nvmode Reg Command */
-	
+
 	reg_SFCTL	= CMD_NORMAL;			/* Return to Normal mode 	*/
 	__REG(CFG_FLASH_BASE + LCR_ERASE_NVMODE) = 0xC0C0C0C0;	/* Confirm 		*/
 
@@ -146,7 +146,7 @@ void SF_NvmodeWrite(void) {
 
 	reg_SFCTL 	= CMD_LCR;			/* Set to LCR mode 		*/
 	__REG(CFG_FLASH_BASE+LCR_PROG_NVMODE) = 0;	/* Issue Program Nvmode reg command */
-	
+
 	reg_SFCTL	= CMD_NORMAL;			/* Return to Normal mode 	*/
 	__REG(CFG_FLASH_BASE+LCR_PROG_NVMODE) = 0xC0C0C0C0; 	/* Confirm not needed 	*/
 
@@ -168,11 +168,11 @@ ulong flash_init(void) {
 	tmp 		= __REG(MODE_REG_VAL);	/* Issue Load Mode Register Command 	*/
 
 	SF_Normal();
- 
+
 	i = 0;
 
 	flash_info[i].flash_id 	=  FLASH_MAN_MT | FLASH_MT28S4M16LC;
-		
+
 	flash_info[i].size 	= FLASH_BANK_SIZE;
 	flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
 
@@ -181,7 +181,7 @@ ulong flash_init(void) {
 	for (j = 0; j < flash_info[i].sector_count; j++) {
 		flash_info[i].start[j] = CFG_FLASH_BASE + j * 0x00100000;
 	}
-	
+
 	flash_protect(FLAG_PROTECT_SET,
 		CFG_FLASH_BASE,
 		CFG_FLASH_BASE + monitor_flash_len - 1,
@@ -208,8 +208,8 @@ void flash_print_info (flash_info_t *info) {
 			printf("Unknown Vendor ");
 			break;
 	}
-	
-	
+
+
 	switch (info->flash_id & FLASH_TYPEMASK) {
 		case (FLASH_MT28S4M16LC & FLASH_TYPEMASK):
 			printf("2x FLASH_MT28S4M16LC (16MB Total)\n");
@@ -226,13 +226,13 @@ void flash_print_info (flash_info_t *info) {
 	printf("  Sector Start Addresses: ");
 
 	for (i = 0; i < info->sector_count; i++) {
-		if ((i % 5) == 0) 
+		if ((i % 5) == 0)
 			printf ("\n   ");
 
 		printf (" %08lX%s", info->start[i],
 			info->protect[i] ? " (RO)" : "     ");
 	}
-	
+
 	printf ("\n");
 }
 
@@ -248,19 +248,19 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) {
 	if (info->flash_id == FLASH_UNKNOWN)
 		return ERR_UNKNOWN_FLASH_TYPE;
 
-	if ((s_first < 0) || (s_first > s_last)) 
+	if ((s_first < 0) || (s_first > s_last))
 		return ERR_INVAL;
 
-	if ((info->flash_id & FLASH_VENDMASK) != (FLASH_MAN_MT & FLASH_VENDMASK)) 
+	if ((info->flash_id & FLASH_VENDMASK) != (FLASH_MAN_MT & FLASH_VENDMASK))
 		return ERR_UNKNOWN_FLASH_VENDOR;
 
 	prot = 0;
 
 	for (sect = s_first; sect <= s_last; ++sect) {
-		if (info->protect[sect]) 
+		if (info->protect[sect])
 			prot++;
 	}
-	
+
 	if (prot) {
 		printf("protected!\n");
 		return ERR_PROTECTED;
@@ -279,7 +279,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) {
 
 /* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last && !ctrlc(); sect++) {
-	
+
 		printf("Erasing sector %2d ... ", sect);
 
 /* arm simple, non interrupt dependent timer */
@@ -307,8 +307,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) {
 	return rc;
 }
 
-
-
 /*-----------------------------------------------------------------------
  * Copy memory to flash.
  */
@@ -316,7 +314,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) {
 int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) {
 	int i;
 
-	for(i = 0; i < cnt; i += 4) { 
+	for(i = 0; i < cnt; i += 4) {
 
 		SF_PrechargeAll();
 
@@ -327,6 +325,6 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) {
 	}
 
 	SF_Normal();
-	
+
 	return ERR_OK;
 }
diff --git a/board/mx1ads/u-boot.lds b/board/mx1ads/u-boot.lds
index 946994d..53743cd 100644
--- a/board/mx1ads/u-boot.lds
+++ b/board/mx1ads/u-boot.lds
@@ -1,6 +1,6 @@
 /*
  * board/mx1ads/u-boot.lds
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
diff --git a/board/pm520/flash.c b/board/pm520/flash.c
index 4ea8b36..572cc9b 100644
--- a/board/pm520/flash.c
+++ b/board/pm520/flash.c
@@ -83,12 +83,18 @@ unsigned long flash_init (void)
 {
 	int i;
 	ulong size = 0;
+	extern void flash_preinit(void);
+	extern void flash_afterinit(ulong, ulong);
+	ulong flashbase = CFG_FLASH_BASE;
+
+	flash_preinit();
 
 	for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
 		switch (i) {
 		case 0:
-			flash_get_size ((FPW *) CFG_FLASH_BASE, &flash_info[i]);
-			flash_get_offsets (CFG_FLASH_BASE, &flash_info[i]);
+			memset(&flash_info[i], 0, sizeof(flash_info_t));
+			flash_get_size ((FPW *) flashbase, &flash_info[i]);
+			flash_get_offsets (flash_info[i].start[0], &flash_info[i]);
 			break;
 		default:
 			panic ("configured to many flash banks!\n");
@@ -99,14 +105,22 @@ unsigned long flash_init (void)
 
 	/* Protect monitor and environment sectors
 	 */
+#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#ifndef CONFIG_BOOT_ROM
 	flash_protect ( FLAG_PROTECT_SET,
 			CFG_MONITOR_BASE,
 			CFG_MONITOR_BASE + monitor_flash_len - 1,
 			&flash_info[0] );
+#endif
+#endif
 
+#ifdef	CFG_ENV_IS_IN_FLASH
 	flash_protect ( FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
 			CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+#endif
+
+	flash_afterinit(flash_info[0].start[0], flash_info[0].size);
 
 	return size;
 }
@@ -195,6 +209,8 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 	addr[0x5555] = (FPW) 0x00900090;
 
 	mb ();
+	udelay(100);
+
 	value = addr[0];
 
 	switch (value) {
@@ -220,18 +236,21 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 		info->flash_id += FLASH_28F128J3A;
 		info->sector_count = 128;
 		info->size = 0x02000000;
+		info->start[0] = CFG_FLASH_BASE;
 		break;				/* => 32 MB     */
 
 	case (FPW) INTEL_ID_28F640J3A:
 		info->flash_id += FLASH_28F640J3A;
 		info->sector_count = 64;
 		info->size = 0x01000000;
+		info->start[0] = CFG_FLASH_BASE + 0x01000000;
 		break;				/* => 16 MB     */
 
 	case (FPW) INTEL_ID_28F320J3A:
 		info->flash_id += FLASH_28F320J3A;
 		info->sector_count = 32;
-		info->size = 0x00800000;
+		info->size = 0x800000;
+		info->start[0] = CFG_FLASH_BASE + 0x01800000;
 		break;				/* => 8 MB     */
 
 	default:
diff --git a/board/pm520/mt46v16m16-75.h b/board/pm520/mt46v16m16-75.h
new file mode 100644
index 0000000..f650faa
--- /dev/null
+++ b/board/pm520/mt46v16m16-75.h
@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright 2004
+ * Mark Jonas, Freescale Semiconductor, mark.jonas@motorola.com.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#define SDRAM_DDR	1		/* is DDR */
+
+#if defined(CONFIG_MPC5200)
+/* Settings for XLB = 132 MHz */
+#define SDRAM_MODE	0x018D0000
+#define SDRAM_EMODE	0x40090000
+#define SDRAM_CONTROL	0x714f0f00
+#define SDRAM_CONFIG1	0x73722930
+#define SDRAM_CONFIG2	0x47770000
+#define SDRAM_TAPDELAY	0x10000000
+
+#else
+#error CONFIG_MPC5200 not defined
+#endif
diff --git a/board/pm520/mt48lc16m16a2-75.h b/board/pm520/mt48lc16m16a2-75.h
new file mode 100644
index 0000000..ffdf039
--- /dev/null
+++ b/board/pm520/mt48lc16m16a2-75.h
@@ -0,0 +1,43 @@
+/*
+ * (C) Copyright 2004
+ * Mark Jonas, Freescale Semiconductor, mark.jonas@motorola.com.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#define SDRAM_DDR	0		/* is SDR */
+
+#if defined(CONFIG_MPC5200)
+/* Settings for XLB = 132 MHz */
+#define SDRAM_MODE	0x00CD0000
+#define SDRAM_CONTROL	0x504F0000
+#define SDRAM_CONFIG1	0xD2322800
+#define SDRAM_CONFIG2	0x8AD70000
+
+#elif defined(CONFIG_MGT5100)
+/* Settings for XLB = 66 MHz */
+#define SDRAM_MODE	0x008D0000
+#define SDRAM_CONTROL	0x504F0000
+#define SDRAM_CONFIG1	0xC2222600
+#define SDRAM_CONFIG2	0x88B70004
+#define SDRAM_ADDRSEL	0x02000000
+
+#else
+#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined
+#endif
diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c
index bb0268f..54f59f5 100644
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -2,6 +2,9 @@
  * (C) Copyright 2003-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
+ * (C) Copyright 2004
+ * Mark Jonas, Freescale Semiconductor, mark.jonas@motorola.com.
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -25,127 +28,209 @@
 #include <mpc5xxx.h>
 #include <pci.h>
 
-#ifndef CFG_RAMBOOT
-static long int dram_size(long int *base, long int maxsize)
-{
-	volatile long int *addr;
-	ulong cnt, val;
-	ulong save[32];			/* to make test non-destructive */
-	unsigned char i = 0;
-
-	for (cnt = (maxsize / sizeof (long)) >> 1; cnt > 0; cnt >>= 1) {
-		addr = base + cnt;		/* pointer arith! */
-
-		save[i++] = *addr;
-		*addr = ~cnt;
-	}
-
-	/* write 0 to base address */
-	addr = base;
-	save[i] = *addr;
-	*addr = 0;
-
-	/* check at base address */
-	if ((val = *addr) != 0) {
-		*addr = save[i];
-		return (0);
-	}
-
-	for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
-		addr = base + cnt;		/* pointer arith! */
-
-		val = *addr;
-		*addr = save[--i];
-
-		if (val != (~cnt)) {
-			return (cnt * sizeof (long));
-		}
-	}
-	return (maxsize);
-}
+#if defined(CONFIG_MPC5200_DDR)
+#include "mt46v16m16-75.h"
+#else
+#include "mt48lc16m16a2-75.h"
+#endif
 
+#ifndef CFG_RAMBOOT
 static void sdram_start (int hi_addr)
 {
 	long hi_addr_bit = hi_addr ? 0x01000000 : 0;
 
 	/* unlock mode register */
-	*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0000 | hi_addr_bit;
+	*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000000 | hi_addr_bit;
+	__asm__ volatile ("sync");
+
 	/* precharge all banks */
-	*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002 | hi_addr_bit;
-	/* set mode register */
-#if defined(CONFIG_MPC5200)
-	*(vu_long *)MPC5XXX_SDRAM_MODE = 0x408d0000;
-#elif defined(CONFIG_MGT5100)
-	*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
+	*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000002 | hi_addr_bit;
+	__asm__ volatile ("sync");
+
+#if SDRAM_DDR
+	/* set mode register: extended mode */
+	*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_EMODE;
+	__asm__ volatile ("sync");
+
+	/* set mode register: reset DLL */
+	*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_MODE | 0x04000000;
+	__asm__ volatile ("sync");
 #endif
+
 	/* precharge all banks */
-	*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002 | hi_addr_bit;
+	*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000002 | hi_addr_bit;
+	__asm__ volatile ("sync");
+
 	/* auto refresh */
-	*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0004 | hi_addr_bit;
+	*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000004 | hi_addr_bit;
+	__asm__ volatile ("sync");
+
 	/* set mode register */
-	*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
+	*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_MODE;
+	__asm__ volatile ("sync");
+
 	/* normal operation */
-	*(vu_long *)MPC5XXX_SDRAM_CTRL = 0x504f0000 | hi_addr_bit;
+	*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | hi_addr_bit;
+	__asm__ volatile ("sync");
 }
 #endif
 
+/*
+ * ATTENTION: Although partially referenced initdram does NOT make real use
+ *            use of CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE
+ *            is something else than 0x00000000.
+ */
+
+#if defined(CONFIG_MPC5200)
 long int initdram (int board_type)
 {
 	ulong dramsize = 0;
+	ulong dramsize2 = 0;
 #ifndef CFG_RAMBOOT
 	ulong test1, test2;
 
-	/* configure SDRAM start/end */
-#if defined(CONFIG_MPC5200)
+	/* setup SDRAM chip selects */
 	*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e;/* 2G at 0x0 */
 	*(vu_long *)MPC5XXX_SDRAM_CS1CFG = 0x80000000;/* disabled */
+	__asm__ volatile ("sync");
 
 	/* setup config registers */
-	*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = 0xc2233a00;
-	*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = 0x88b70004;
+	*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1;
+	*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2;
+	__asm__ volatile ("sync");
+
+#if SDRAM_DDR
+	/* set tap delay */
+	*(vu_long *)MPC5XXX_CDM_PORCFG = SDRAM_TAPDELAY;
+	__asm__ volatile ("sync");
+#endif
+
+	/* find RAM size using SDRAM CS0 only */
+	sdram_start(0);
+	test1 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
+	sdram_start(1);
+	test2 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
+	if (test1 > test2) {
+		sdram_start(0);
+		dramsize = test1;
+	} else {
+		dramsize = test2;
+	}
+
+	/* memory smaller than 1MB is impossible */
+	if (dramsize < (1 << 20)) {
+		dramsize = 0;
+	}
+
+	/* set SDRAM CS0 size according to the amount of RAM found */
+	if (dramsize > 0) {
+		*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x13 + __builtin_ffs(dramsize >> 20) - 1;
+	} else {
+		*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0; /* disabled */
+	}
+
+	/* let SDRAM CS1 start right after CS0 */
+	*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize + 0x0000001e;/* 2G */
+
+	/* find RAM size using SDRAM CS1 only */
+	sdram_start(0);
+	test1 = get_ram_size((ulong *)(CFG_SDRAM_BASE + dramsize), 0x80000000);
+	sdram_start(1);
+	test2 = get_ram_size((ulong *)(CFG_SDRAM_BASE + dramsize), 0x80000000);
+	if (test1 > test2) {
+		sdram_start(0);
+		dramsize2 = test1;
+	} else {
+		dramsize2 = test2;
+	}
+
+	/* memory smaller than 1MB is impossible */
+	if (dramsize2 < (1 << 20)) {
+		dramsize2 = 0;
+	}
+
+	/* set SDRAM CS1 size according to the amount of RAM found */
+	if (dramsize2 > 0) {
+		*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize
+			| (0x13 + __builtin_ffs(dramsize2 >> 20) - 1);
+	} else {
+		*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
+	}
+
+#else /* CFG_RAMBOOT */
+
+	/* retrieve size of memory connected to SDRAM CS0 */
+	dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
+	if (dramsize >= 0x13) {
+		dramsize = (1 << (dramsize - 0x13)) << 20;
+	} else {
+		dramsize = 0;
+	}
+
+	/* retrieve size of memory connected to SDRAM CS1 */
+	dramsize2 = *(vu_long *)MPC5XXX_SDRAM_CS1CFG & 0xFF;
+	if (dramsize2 >= 0x13) {
+		dramsize2 = (1 << (dramsize2 - 0x13)) << 20;
+	} else {
+		dramsize2 = 0;
+	}
+
+#endif /* CFG_RAMBOOT */
+
+	return dramsize + dramsize2;
+}
 
 #elif defined(CONFIG_MGT5100)
+
+long int initdram (int board_type)
+{
+	ulong dramsize = 0;
+#ifndef CFG_RAMBOOT
+	ulong test1, test2;
+
+	/* setup and enable SDRAM chip selects */
 	*(vu_long *)MPC5XXX_SDRAM_START = 0x00000000;
 	*(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */
 	*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */
+	__asm__ volatile ("sync");
 
 	/* setup config registers */
-	*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = 0xc2222600;
-	*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = 0x88b70004;
+	*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1;
+	*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2;
 
 	/* address select register */
-	*(vu_long *)MPC5XXX_SDRAM_XLBSEL = 0x03000000;
-#endif
+	*(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL;
+	__asm__ volatile ("sync");
+
+	/* find RAM size */
 	sdram_start(0);
-	test1 = dram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
+	test1 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
 	sdram_start(1);
-	test2 = dram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
+	test2 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
 	if (test1 > test2) {
 		sdram_start(0);
 		dramsize = test1;
 	} else {
 		dramsize = test2;
 	}
-#if defined(CONFIG_MPC5200)
-	*(vu_long *)MPC5XXX_SDRAM_CS0CFG =
-		(0x13 + __builtin_ffs(dramsize >> 20) - 1);
-	*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
-#elif defined(CONFIG_MGT5100)
+
+	/* set SDRAM end address according to size */
 	*(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15);
-#endif
 
-#else
-#ifdef CONFIG_MGT5100
-	*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */
+#else /* CFG_RAMBOOT */
+
+	/* Retrieve amount of SDRAM available */
 	dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15);
-#else
-	dramsize = ((1 << (*(vu_long *)MPC5XXX_SDRAM_CS0CFG - 0x13)) << 20);
-#endif
+
 #endif /* CFG_RAMBOOT */
-	/* return total ram size */
+
 	return dramsize;
 }
 
+#else
+#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined
+#endif
+
 int checkboard (void)
 {
 #if defined(CONFIG_MPC5200)
@@ -171,14 +256,32 @@ void flash_preinit(void)
 	*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
 }
 
-void flash_afterinit(ulong size)
+void flash_afterinit(ulong start, ulong size)
 {
-	if (size == 0x800000) { /* adjust mapping */
-		*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
-			START_REG(CFG_BOOTCS_START | size);
-		*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
-			STOP_REG(CFG_BOOTCS_START | size, size);
-	}
+#if defined(CONFIG_BOOT_ROM)
+	/* adjust mapping */
+	*(vu_long *)MPC5XXX_CS1_START =
+			START_REG(start);
+	*(vu_long *)MPC5XXX_CS1_STOP =
+			STOP_REG(start, size);
+#else
+	/* adjust mapping */
+	*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
+			START_REG(start);
+	*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
+			STOP_REG(start, size);
+#endif
+}
+
+
+extern flash_info_t flash_info[];	/* info for FLASH chips */
+
+int misc_init_r (void)
+{
+	DECLARE_GLOBAL_DATA_PTR;
+	/* adjust flash start */
+	gd->bd->bi_flashstart = flash_info[0].start[0];
+	return (0);
 }
 
 #ifdef	CONFIG_PCI
@@ -191,3 +294,26 @@ void pci_init_board(void)
 	pci_mpc5xxx_init(&hose);
 }
 #endif
+
+#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
+
+void init_ide_reset (void)
+{
+	debug ("init_ide_reset\n");
+
+}
+
+void ide_set_reset (int idereset)
+{
+	debug ("ide_reset(%d)\n", idereset);
+
+}
+#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+
+#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+extern void doc_probe (ulong physadr);
+void doc_init (void)
+{
+	doc_probe (CFG_DOC_BASE);
+}
+#endif
diff --git a/common/env_nand.c b/common/env_nand.c
index 2412b10..516aed7 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -78,7 +78,7 @@ char * env_name_spec = "NAND";
 extern uchar environment[];
 env_t *env_ptr = (env_t *)(&environment[0]);
 #else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = 0;   //(env_t *)CFG_ENV_ADDR;
+env_t *env_ptr = 0;
 #endif /* ENV_IS_EMBEDDED */
 
 
diff --git a/cpu/mc9328/Makefile b/cpu/mc9328/Makefile
index 0261ba6..fccc6ab 100644
--- a/cpu/mc9328/Makefile
+++ b/cpu/mc9328/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(CPU).a
 
 START	= start.o
-OBJS	= serial.o interrupts.o cpu.o 
+OBJS	= serial.o interrupts.o cpu.o
 
 all:	.depend $(START) $(LIB)
 
diff --git a/cpu/mc9328/interrupts.c b/cpu/mc9328/interrupts.c
index 3a922cf..2407db6 100644
--- a/cpu/mc9328/interrupts.c
+++ b/cpu/mc9328/interrupts.c
@@ -243,8 +243,7 @@ unsigned long long get_ticks(void)
  * This function is derived from PowerPC code (timebase clock frequency).
  * On ARM it returns the number of timer ticks per second.
  */
- 
+
 ulong  get_tbclk (void) {
 	return CFG_HZ;
 }
-
diff --git a/cpu/mc9328/serial.c b/cpu/mc9328/serial.c
index 45b6f8a..8dcfb80 100644
--- a/cpu/mc9328/serial.c
+++ b/cpu/mc9328/serial.c
@@ -1,6 +1,6 @@
 /*
- * cpu/mc9328/serial.c 
- * 
+ * cpu/mc9328/serial.c
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -23,11 +23,10 @@
  * MA 02111-1307 USA
  */
 
-
 #include <common.h>
 #include <mc9328.h>
 
-#if defined(CONFIG_UART1) 
+#if defined(CONFIG_UART1)
 /* GPIO PORT B 		*/
 
 #define reg_GIUS	MX1_GIUS_C
@@ -35,7 +34,6 @@
 #define GPIO_MASK	0xFFFFE1FF
 #define UART_BASE	0x00206000
 
-
 #elif defined (CONFIG_UART2)
 /* GPIO PORT C  	*/
 
@@ -44,7 +42,7 @@
 #define GPIO_MASK 	0x0FFFFFFF
 #define UART_BASE	0x207000
 
-#endif 
+#endif
 
 #define reg_URXD	(*((volatile u32 *)(UART_BASE+0x00)))
 #define reg_UTXD	(*((volatile u32 *)(UART_BASE+0x40)))
@@ -64,16 +62,13 @@
 #define TXFE_MASK	0x4000  	/* Tx buffer empty	*/
 #define RDR_MASK	0x0001		/* receive data ready	*/
 
-
 void serial_setbrg (void) {
 
-/* config I/O pins for UART 	*/
-
+	/* config I/O pins for UART 	*/
 	reg_GIUS 	&= GPIO_MASK;
 	reg_GPR		&= GPIO_MASK;
 
-/* config UART			*/
-
+	/* config UART			*/
 	reg_UCR1 	= 5;
 	reg_UCR2 	= 0x4027;
 	reg_UCR4 	= 1;
@@ -84,22 +79,18 @@ void serial_setbrg (void) {
 	reg_UBRC 	= 8;
 }
 
-
-
 /*
  * Initialise the serial port with the given baudrate. The settings
  * are always 8 data bits, no parity, 1 stop bit, no start bits.
  *
  */
- 
+
 int serial_init (void) {
 	serial_setbrg ();
 
 	return (0);
 }
 
-
-
 /*
  * Read a single byte from the serial port. Returns 1 on success, 0
  * otherwise. When the function is succesfull, the character read is
@@ -112,7 +103,6 @@ int serial_getc (void) {
 	return (u8)reg_URXD;
 }
 
-
 /*
  * Output a single byte to the serial port.
  */
@@ -129,7 +119,6 @@ void serial_putc (const char c) {
 
 }
 
-
 /*
  * Test whether a character is in the RX buffer
  */
@@ -137,10 +126,8 @@ int serial_tstc (void) {
 	return reg_USR2 & RDR_MASK;
 }
 
-
 void serial_puts (const char *s) {
 	while (*s) {
 		serial_putc (*s++);
 	}
 }
-
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 66f978e..5a00133 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -59,10 +59,13 @@
 #define CONFIG_BOOTP_MASK	(CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
 
 #define CONFIG_COMMANDS	      ( CONFIG_CMD_DFL	| \
-				CFG_CMD_BEDBUG  | \
+				CFG_CMD_BEDBUG	| \
+				CFG_CMD_DATE	| \
 				CFG_CMD_DHCP	| \
+				CFG_CMD_EEPROM	| \
+				CFG_CMD_I2C	| \
 				CFG_CMD_PCI	| \
-				0 /* CFG_CMD_DATE */	)
+				CFG_CMD_SDRAM	)
 
 /* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
  */
@@ -77,17 +80,17 @@
 #define CFG_CBSIZE	256		/* Console I/O Buffer Size	*/
 
 #if 1
-#define	CFG_HUSH_PARSER		1	/* use "hush" command parser	*/
+#define CFG_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
 #ifdef	CFG_HUSH_PARSER
-#define	CFG_PROMPT_HUSH_PS2	"> "
+#define CFG_PROMPT_HUSH_PS2	"> "
 #endif
 
 /* Print Buffer Size
  */
 #define CFG_PBSIZE	(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
 
-#define	CFG_MAXARGS	16		/* max number of command args	*/
+#define CFG_MAXARGS	16		/* max number of command args	*/
 #define CFG_BARGSIZE	CFG_CBSIZE	/* Boot Argument Buffer Size	*/
 #define CFG_LOAD_ADDR	0x00100000	/* Default load address		*/
 
@@ -97,29 +100,29 @@
  * Please note that CFG_SDRAM_BASE _must_ start at 0
  */
 
-#define CFG_SDRAM_BASE	    0x00000000
+#define CFG_SDRAM_BASE		0x00000000
 
 #if defined(CONFIG_BOOT_ROM)
-#define CFG_FLASH_BASE	    0xFF000000
+#define CFG_FLASH_BASE		0xFF000000
 #else
-#define CFG_FLASH_BASE	    0xFF800000
+#define CFG_FLASH_BASE		0xFF800000
 #endif
 
-#define CFG_RESET_ADDRESS   0xFFF00100
+#define CFG_RESET_ADDRESS	0xFFF00100
 
-#define CFG_EUMB_ADDR	    0xFCE00000
+#define CFG_EUMB_ADDR		0xFCE00000
 
-#define CFG_MONITOR_BASE    TEXT_BASE
+#define CFG_MONITOR_BASE	TEXT_BASE
 
-#define CFG_MONITOR_LEN	    (256 << 10) /* Reserve 256 kB for Monitor	*/
-#define CFG_MALLOC_LEN	    (128 << 10) /* Reserve 128 kB for malloc()	*/
+#define CFG_MONITOR_LEN		(256 << 10)	/* Reserve 256 kB for Monitor	*/
+#define CFG_MALLOC_LEN		(128 << 10)	/* Reserve 128 kB for malloc()	*/
 
-#define CFG_MEMTEST_START   0x00004000	/* memtest works on		*/
-#define CFG_MEMTEST_END	    0x02000000	/* 0 ... 32 MB in DRAM		*/
+#define CFG_MEMTEST_START	0x00004000	/* memtest works on		*/
+#define CFG_MEMTEST_END		0x02000000	/* 0 ... 32 MB in DRAM		*/
 
-	/* Maximum amount of RAM.
-	 */
-#define CFG_MAX_RAM_SIZE    0x10000000
+/* Maximum amount of RAM.
+ */
+#define CFG_MAX_RAM_SIZE	0x10000000
 
 
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
@@ -133,13 +136,13 @@
  * Definitions for initial stack pointer and data area
  */
 
-	/* Size in bytes reserved for initial data
-	 */
-#define CFG_GBL_DATA_SIZE    128
+/* Size in bytes reserved for initial data
+ */
+#define CFG_GBL_DATA_SIZE	128
 
-#define CFG_INIT_RAM_ADDR     0x40000000
-#define CFG_INIT_RAM_END      0x1000
-#define CFG_GBL_DATA_OFFSET  (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_RAM_ADDR	0x40000000
+#define CFG_INIT_RAM_END	0x1000
+#define CFG_GBL_DATA_OFFSET	(CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 
 /*
  * NS16550 Configuration
@@ -153,7 +156,30 @@
 
 #define CFG_NS16550_COM1	(CFG_EUMB_ADDR + 0x4500)
 #define CFG_NS16550_COM2	(CFG_EUMB_ADDR + 0x4600)
-#define	DUART_DCR		(CFG_EUMB_ADDR + 0x4511)
+#define DUART_DCR		(CFG_EUMB_ADDR + 0x4511)
+
+/*
+ * I2C configuration
+ */
+#define CONFIG_HARD_I2C		1	/* I2C with hardware support */
+
+#define CFG_I2C_SPEED		100000 /* 100 kHz */
+#define CFG_I2C_SLAVE		0x7F
+
+/*
+ * RTC configuration
+ */
+#define CONFIG_RTC_PCF8563
+#define CFG_I2C_RTC_ADDR	0x51
+
+/*
+ * EEPROM configuration
+ */
+#define CFG_I2C_EEPROM_ADDR		0x58
+#define CFG_I2C_EEPROM_ADDR_LEN		1
+#define CFG_EEPROM_PAGE_WRITE_BITS	4
+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10
+#define CFG_I2C_EEPROM_ADDR_OVERFLOW	0x07
 
 /*
  * Low Level Configuration Settings
@@ -162,62 +188,49 @@
  * For the detail description refer to the MPC8240 user's manual.
  */
 
-#define CONFIG_SYS_CLK_FREQ  33000000
-#define CFG_HZ		     1000
-/*
- * SDRAM Configuration Settings
- * Please note: currently only 64 and 128 MB SDRAM size supported
- * set CFG_SDRAM_SIZE to 64 or 128
- * Memory configuration using SPD information stored on the SODIMMs
- * not yet supported.
- */
+#define CONFIG_SYS_CLK_FREQ	33000000
+#define CFG_HZ			1000
 
-#define	CFG_SDRAM_SIZE    64		/* SDRAM size -- 64 or 128 MB supported */
 
-	/* Bit-field values for MCCR1.
-	 */
-#define CFG_ROMNAL	    0
-#define CFG_ROMFAL	    7
+/* Bit-field values for MCCR1.
+ */
+#define CFG_ROMNAL		0
+#define CFG_ROMFAL		8
+
+#define CFG_BANK0_ROW		0	/* SDRAM bank 7-0 row address */
+#define CFG_BANK1_ROW		0
+#define CFG_BANK2_ROW		0
+#define CFG_BANK3_ROW		0
+#define CFG_BANK4_ROW		0
+#define CFG_BANK5_ROW		0
+#define CFG_BANK6_ROW		0
+#define CFG_BANK7_ROW		0
+
+/* Bit-field values for MCCR2.
+ */
 
-#if (CFG_SDRAM_SIZE == 64)			/* 64 MB */
-#define CFG_BANK0_ROW	0			/* SDRAM bank 7-0 row address */
-#elif (CFG_SDRAM_SIZE == 128)			/* 128 MB */
-#define CFG_BANK0_ROW	2			/* SDRAM bank 7-0 row address */
-#else
-#  error "SDRAM size not supported"
-#endif
-#define CFG_BANK1_ROW	0
-#define CFG_BANK2_ROW	0
-#define CFG_BANK3_ROW	0
-#define CFG_BANK4_ROW	0
-#define CFG_BANK5_ROW	0
-#define CFG_BANK6_ROW	0
-#define CFG_BANK7_ROW	0
-
-	/* Bit-field values for MCCR2.
-	 */
-#define CFG_REFINT	    430	    /* Refresh interval			*/
+#define CFG_REFINT		0x2ec
 
-	/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4.
-	 */
-#define CFG_BSTOPRE	    192
+/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4.
+ */
+#define CFG_BSTOPRE		160
 
-	/* Bit-field values for MCCR3.
-	 */
-#define CFG_REFREC	    2	    /* Refresh to activate interval	*/
-#define CFG_RDLAT	    3	    /* Data latancy from read command	*/
+/* Bit-field values for MCCR3.
+ */
+#define CFG_REFREC		2	/* Refresh to activate interval		*/
+#define CFG_RDLAT		0	/* Data latancy from read command	*/
 
-	/* Bit-field values for MCCR4.
-	 */
-#define CFG_PRETOACT	    2	    /* Precharge to activate interval	*/
-#define CFG_ACTTOPRE	    5	    /* Activate to Precharge interval	*/
-#define CFG_SDMODE_CAS_LAT  2	    /* SDMODE CAS latancy		*/
-#define CFG_SDMODE_WRAP	    0	    /* SDMODE wrap type			*/
-#define CFG_SDMODE_BURSTLEN 2	    /* SDMODE Burst length		*/
-#define CFG_ACTORW	    2
+/* Bit-field values for MCCR4.
+ */
+#define CFG_PRETOACT		2	/* Precharge to activate interval	*/
+#define CFG_ACTTOPRE		5	/* Activate to Precharge interval	*/
+#define CFG_SDMODE_CAS_LAT	2	/* SDMODE CAS latancy			*/
+#define CFG_SDMODE_WRAP		0	/* SDMODE wrap type			*/
+#define CFG_SDMODE_BURSTLEN	2	/* SDMODE Burst length			*/
+#define CFG_ACTORW		2
 #define CFG_REGISTERD_TYPE_BUFFER 1
-#define CFG_EXTROM	    1
-#define CFG_REGDIMM	    0
+#define CFG_EXTROM		0
+#define CFG_REGDIMM		0
 
 /* Memory bank settings.
  * Only bits 20-29 are actually used from these vales to set the
@@ -226,32 +239,35 @@
  * address. Refer to the MPC8240 book.
  */
 
-#define CFG_BANK0_START	    0x00000000
-#define CFG_BANK0_END	    (CFG_MAX_RAM_SIZE - 1)
-#define CFG_BANK0_ENABLE    1
-#define CFG_BANK1_START	    0x3ff00000
-#define CFG_BANK1_END	    0x3fffffff
-#define CFG_BANK1_ENABLE    0
-#define CFG_BANK2_START	    0x3ff00000
-#define CFG_BANK2_END	    0x3fffffff
-#define CFG_BANK2_ENABLE    0
-#define CFG_BANK3_START	    0x3ff00000
-#define CFG_BANK3_END	    0x3fffffff
-#define CFG_BANK3_ENABLE    0
-#define CFG_BANK4_START	    0x3ff00000
-#define CFG_BANK4_END	    0x3fffffff
-#define CFG_BANK4_ENABLE    0
-#define CFG_BANK5_START	    0x3ff00000
-#define CFG_BANK5_END	    0x3fffffff
-#define CFG_BANK5_ENABLE    0
-#define CFG_BANK6_START	    0x3ff00000
-#define CFG_BANK6_END	    0x3fffffff
-#define CFG_BANK6_ENABLE    0
-#define CFG_BANK7_START	    0x3ff00000
-#define CFG_BANK7_END	    0x3fffffff
-#define CFG_BANK7_ENABLE    0
-
-#define CFG_ODCR	    0xff
+#define CFG_BANK0_START		0x00000000
+#define CFG_BANK0_END		(CFG_MAX_RAM_SIZE - 1)
+#define CFG_BANK0_ENABLE	1
+#define CFG_BANK1_START		0x3ff00000
+#define CFG_BANK1_END		0x3fffffff
+#define CFG_BANK1_ENABLE	0
+#define CFG_BANK2_START		0x3ff00000
+#define CFG_BANK2_END		0x3fffffff
+#define CFG_BANK2_ENABLE	0
+#define CFG_BANK3_START		0x3ff00000
+#define CFG_BANK3_END		0x3fffffff
+#define CFG_BANK3_ENABLE	0
+#define CFG_BANK4_START		0x3ff00000
+#define CFG_BANK4_END		0x3fffffff
+#define CFG_BANK4_ENABLE	0
+#define CFG_BANK5_START		0x3ff00000
+#define CFG_BANK5_END		0x3fffffff
+#define CFG_BANK5_ENABLE	0
+#define CFG_BANK6_START		0x3ff00000
+#define CFG_BANK6_END		0x3fffffff
+#define CFG_BANK6_ENABLE	0
+#define CFG_BANK7_START		0x3ff00000
+#define CFG_BANK7_END		0x3fffffff
+#define CFG_BANK7_ENABLE	0
+
+#define CFG_ODCR		0xff
+#define CFG_PGMAX		0x32	/* how long the 8240 retains the	*/
+					/* currently accessed page in memory	*/
+					/* see 8240 book for details		*/
 
 #define CFG_IBAT0L  (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
 #define CFG_IBAT0U  (CFG_SDRAM_BASE | BATU_BL_256M | BATU_VS | BATU_VP)
@@ -279,7 +295,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CFG_BOOTMAPSZ	    (8 << 20)	/* Initial Memory map for Linux */
+#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
  * FLASH organization
@@ -295,7 +311,7 @@
 	 */
 #define CFG_ENV_IS_IN_FLASH	    1
 
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x7C0000)
+#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x7F8000)
 #define CFG_ENV_SIZE		0x4000	/* Size of the Environment		*/
 #define CFG_ENV_OFFSET		0	/* starting right at the beginning	*/
 #define CFG_ENV_SECT_SIZE	0x8000 /* Size of the Environment Sector	*/
@@ -317,118 +333,118 @@
 #define BOOTFLAG_WARM		0x02	/* Software reboot			*/
 
 
-#define	SRAM_BASE		0x80000000	/* SRAM base address 	*/
-#define	SRAM_END		0x801FFFFF
+#define SRAM_BASE		0x80000000	/* SRAM base address	*/
+#define SRAM_END		0x801FFFFF
 
-/*---------------------------------------------------------------------*/
-/* CPC45 Memory Map                                                    */
-/*---------------------------------------------------------------------*/
-#define	SRAM_BASE	0x80000000	/* SRAM base address            */
-#define	ST16552_A_BASE	0x80200000	/* ST16552 channel A		*/
-#define	ST16552_B_BASE	0x80400000	/* ST16552 channel A		*/
-#define	BCSR_BASE	0x80600000	/* board control / status registers */
-#define	DISPLAY_BASE	0x80600040	/* DISPLAY base			*/
-#define	PCMCIA_MEM_BASE	0x81000000	/* PCMCIA memory window base        */
-#define	PCMCIA_IO_BASE	0xFE000000	/* PCMCIA IO window base            */
+/*----------------------------------------------------------------------*/
+/* CPC45 Memory Map							*/
+/*----------------------------------------------------------------------*/
+#define SRAM_BASE	0x80000000	/* SRAM base address		*/
+#define ST16552_A_BASE	0x80200000	/* ST16552 channel A		*/
+#define ST16552_B_BASE	0x80400000	/* ST16552 channel A		*/
+#define BCSR_BASE	0x80600000	/* board control / status registers */
+#define DISPLAY_BASE	0x80600040	/* DISPLAY base			*/
+#define PCMCIA_MEM_BASE 0x81000000	/* PCMCIA memory window base	*/
+#define PCMCIA_IO_BASE	0xFE000000	/* PCMCIA IO window base	*/
 
 
 /*---------------------------------------------------------------------*/
-/* CPC45 Control/Status Registers                                      */
+/* CPC45 Control/Status Registers				       */
 /*---------------------------------------------------------------------*/
-#define	IRQ_ENA_1		*((volatile uchar*)(BCSR_BASE + 0x00))
-#define	IRQ_STAT_1		*((volatile uchar*)(BCSR_BASE + 0x01))
-#define	IRQ_ENA_2		*((volatile uchar*)(BCSR_BASE + 0x02))
-#define	IRQ_STAT_2		*((volatile uchar*)(BCSR_BASE + 0x03))
-#define	BOARD_CTRL		*((volatile uchar*)(BCSR_BASE + 0x04))
-#define	BOARD_STAT		*((volatile uchar*)(BCSR_BASE + 0x05))
-#define	WDG_START		*((volatile uchar*)(BCSR_BASE + 0x06))
-#define	WDG_PRESTOP		*((volatile uchar*)(BCSR_BASE + 0x06))
-#define	WDG_STOP		*((volatile uchar*)(BCSR_BASE + 0x06))
-#define	BOARD_REV		*((volatile uchar*)(BCSR_BASE + 0x07))
+#define IRQ_ENA_1		*((volatile uchar*)(BCSR_BASE + 0x00))
+#define IRQ_STAT_1		*((volatile uchar*)(BCSR_BASE + 0x01))
+#define IRQ_ENA_2		*((volatile uchar*)(BCSR_BASE + 0x02))
+#define IRQ_STAT_2		*((volatile uchar*)(BCSR_BASE + 0x03))
+#define BOARD_CTRL		*((volatile uchar*)(BCSR_BASE + 0x04))
+#define BOARD_STAT		*((volatile uchar*)(BCSR_BASE + 0x05))
+#define WDG_START		*((volatile uchar*)(BCSR_BASE + 0x06))
+#define WDG_PRESTOP		*((volatile uchar*)(BCSR_BASE + 0x06))
+#define WDG_STOP		*((volatile uchar*)(BCSR_BASE + 0x06))
+#define BOARD_REV		*((volatile uchar*)(BCSR_BASE + 0x07))
 
 /* IRQ_ENA_1 bit definitions */
-#define	I_ENA_1_IERA	0x80		/* INTA enable 			*/
-#define	I_ENA_1_IERB	0x40		/* INTB enable			*/
-#define	I_ENA_1_IERC	0x20		/* INTC enable			*/
-#define	I_ENA_1_IERD	0x10		/* INTD enable			*/
+#define I_ENA_1_IERA	0x80		/* INTA enable			*/
+#define I_ENA_1_IERB	0x40		/* INTB enable			*/
+#define I_ENA_1_IERC	0x20		/* INTC enable			*/
+#define I_ENA_1_IERD	0x10		/* INTD enable			*/
 
 /* IRQ_STAT_1 bit definitions */
-#define	I_STAT_1_INTA	0x80		/* INTA status			*/
-#define	I_STAT_1_INTB	0x40		/* INTB status			*/
-#define	I_STAT_1_INTC	0x20		/* INTC status			*/
-#define	I_STAT_1_INTD	0x10		/* INTD status			*/
+#define I_STAT_1_INTA	0x80		/* INTA status			*/
+#define I_STAT_1_INTB	0x40		/* INTB status			*/
+#define I_STAT_1_INTC	0x20		/* INTC status			*/
+#define I_STAT_1_INTD	0x10		/* INTD status			*/
 
 /* IRQ_ENA_2 bit definitions */
-#define	I_ENA_2_IEAB	0x80		/* ABORT IRQ enable		*/
-#define	I_ENA_2_IEK1	0x40		/* KEY1 IRQ enable		*/
-#define	I_ENA_2_IEK2	0x20		/* KEY2 IRQ enable		*/
-#define	I_ENA_2_IERT	0x10		/* RTC IRQ enable		*/
-#define	I_ENA_2_IESM	0x08		/* LM81 IRQ enable		*/
-#define	I_ENA_2_IEDG	0x04		/* DEGENERATING IRQ enable	*/
-#define	I_ENA_2_IES2	0x02		/* ST16552/B IRQ enable		*/
-#define	I_ENA_2_IES1	0x01		/* ST16552/A IRQ enable		*/
+#define I_ENA_2_IEAB	0x80		/* ABORT IRQ enable		*/
+#define I_ENA_2_IEK1	0x40		/* KEY1 IRQ enable		*/
+#define I_ENA_2_IEK2	0x20		/* KEY2 IRQ enable		*/
+#define I_ENA_2_IERT	0x10		/* RTC IRQ enable		*/
+#define I_ENA_2_IESM	0x08		/* LM81 IRQ enable		*/
+#define I_ENA_2_IEDG	0x04		/* DEGENERATING IRQ enable	*/
+#define I_ENA_2_IES2	0x02		/* ST16552/B IRQ enable		*/
+#define I_ENA_2_IES1	0x01		/* ST16552/A IRQ enable		*/
 
 /* IRQ_STAT_2 bit definitions */
-#define	I_STAT_2_ABO	0x80		/* ABORT IRQ status		*/
-#define	I_STAT_2_KY1	0x40		/* KEY1 IRQ status		*/
-#define	I_STAT_2_KY2	0x20		/* KEY2 IRQ status		*/
-#define	I_STAT_2_RTC	0x10		/* RTC IRQ status		*/
-#define	I_STAT_2_SMN	0x08		/* LM81 IRQ status		*/
-#define	I_STAT_2_DEG	0x04		/* DEGENERATING IRQ status	*/
-#define	I_STAT_2_SIO2	0x02		/* ST16552/B IRQ status		*/
-#define	I_STAT_2_SIO1	0x01		/* ST16552/A IRQ status		*/
+#define I_STAT_2_ABO	0x80		/* ABORT IRQ status		*/
+#define I_STAT_2_KY1	0x40		/* KEY1 IRQ status		*/
+#define I_STAT_2_KY2	0x20		/* KEY2 IRQ status		*/
+#define I_STAT_2_RTC	0x10		/* RTC IRQ status		*/
+#define I_STAT_2_SMN	0x08		/* LM81 IRQ status		*/
+#define I_STAT_2_DEG	0x04		/* DEGENERATING IRQ status	*/
+#define I_STAT_2_SIO2	0x02		/* ST16552/B IRQ status		*/
+#define I_STAT_2_SIO1	0x01		/* ST16552/A IRQ status		*/
 
 /* BOARD_CTRL bit definitions */
-#define	USER_LEDS		2			/* 2 user LEDs	*/
+#define USER_LEDS		2			/* 2 user LEDs	*/
 
 #if (USER_LEDS == 4)
-#define	B_CTRL_WRSE		0x80
-#define	B_CTRL_KRSE		0x40
-#define	B_CTRL_FWRE		0x20		/* Flash write enable		*/
-#define	B_CTRL_FWPT		0x10		/* Flash write protect		*/
-#define	B_CTRL_LED3		0x08		/* LED 3 control		*/
-#define	B_CTRL_LED2		0x04		/* LED 2 control		*/
-#define	B_CTRL_LED1		0x02		/* LED 1 control		*/
-#define	B_CTRL_LED0		0x01		/* LED 0 control		*/
+#define B_CTRL_WRSE		0x80
+#define B_CTRL_KRSE		0x40
+#define B_CTRL_FWRE		0x20		/* Flash write enable		*/
+#define B_CTRL_FWPT		0x10		/* Flash write protect		*/
+#define B_CTRL_LED3		0x08		/* LED 3 control		*/
+#define B_CTRL_LED2		0x04		/* LED 2 control		*/
+#define B_CTRL_LED1		0x02		/* LED 1 control		*/
+#define B_CTRL_LED0		0x01		/* LED 0 control		*/
 #else
-#define	B_CTRL_WRSE		0x80
-#define	B_CTRL_KRSE		0x40
-#define	B_CTRL_FWRE_1		0x20		/* Flash write enable		*/
-#define	B_CTRL_FWPT_1		0x10		/* Flash write protect		*/
-#define	B_CTRL_LED1		0x08		/* LED 1 control		*/
-#define	B_CTRL_LED0		0x04		/* LED 0 control		*/
-#define	B_CTRL_FWRE_0		0x02		/* Flash write enable		*/
-#define	B_CTRL_FWPT_0		0x01		/* Flash write protect		*/
+#define B_CTRL_WRSE		0x80
+#define B_CTRL_KRSE		0x40
+#define B_CTRL_FWRE_1		0x20		/* Flash write enable		*/
+#define B_CTRL_FWPT_1		0x10		/* Flash write protect		*/
+#define B_CTRL_LED1		0x08		/* LED 1 control		*/
+#define B_CTRL_LED0		0x04		/* LED 0 control		*/
+#define B_CTRL_FWRE_0		0x02		/* Flash write enable		*/
+#define B_CTRL_FWPT_0		0x01		/* Flash write protect		*/
 #endif
 
 /* BOARD_STAT bit definitions */
-#define	B_STAT_WDGE		0x80
-#define	B_STAT_WDGS		0x40
-#define	B_STAT_WRST		0x20
-#define	B_STAT_KRST		0x10
-#define	B_STAT_CSW3		0x08		/* sitch bit 3 status		*/
-#define	B_STAT_CSW2		0x04		/* sitch bit 2 status		*/
-#define	B_STAT_CSW1		0x02		/* sitch bit 1 status		*/
-#define	B_STAT_CSW0		0x01		/* sitch bit 0 status		*/
+#define B_STAT_WDGE		0x80
+#define B_STAT_WDGS		0x40
+#define B_STAT_WRST		0x20
+#define B_STAT_KRST		0x10
+#define B_STAT_CSW3		0x08		/* sitch bit 3 status		*/
+#define B_STAT_CSW2		0x04		/* sitch bit 2 status		*/
+#define B_STAT_CSW1		0x02		/* sitch bit 1 status		*/
+#define B_STAT_CSW0		0x01		/* sitch bit 0 status		*/
 
 /*---------------------------------------------------------------------*/
-/* Display addresses                                                   */
+/* Display addresses						       */
 /*---------------------------------------------------------------------*/
-#define	DISP_UDC_RAM	(DISPLAY_BASE + 0x08)	/* UDC RAM	       */
-#define	DISP_CHR_RAM	(DISPLAY_BASE + 0x18)	/* character Ram       */
-#define	DISP_FLASH	(DISPLAY_BASE + 0x20)	/* Flash Ram           */
+#define DISP_UDC_RAM	(DISPLAY_BASE + 0x08)	/* UDC RAM	       */
+#define DISP_CHR_RAM	(DISPLAY_BASE + 0x18)	/* character Ram       */
+#define DISP_FLASH	(DISPLAY_BASE + 0x20)	/* Flash Ram	       */
 
-#define	DISP_UDC_ADR	*((volatile uchar*)(DISPLAY_BASE + 0x00))	/* UDC Address Reg.    */
-#define	DISP_CWORD	*((volatile uchar*)(DISPLAY_BASE + 0x10))	/* Control Word Reg.   */
+#define DISP_UDC_ADR	*((volatile uchar*)(DISPLAY_BASE + 0x00))	/* UDC Address Reg.    */
+#define DISP_CWORD	*((volatile uchar*)(DISPLAY_BASE + 0x10))	/* Control Word Reg.   */
 
-#define	DISP_DIG0	*((volatile uchar*)(DISP_CHR_RAM + 0x00))	/* Digit 0 address     */
-#define	DISP_DIG1	*((volatile uchar*)(DISP_CHR_RAM + 0x01))	/* Digit 0 address     */
-#define	DISP_DIG2	*((volatile uchar*)(DISP_CHR_RAM + 0x02))	/* Digit 0 address     */
-#define	DISP_DIG3	*((volatile uchar*)(DISP_CHR_RAM + 0x03))	/* Digit 0 address     */
-#define	DISP_DIG4	*((volatile uchar*)(DISP_CHR_RAM + 0x04))	/* Digit 0 address     */
-#define	DISP_DIG5	*((volatile uchar*)(DISP_CHR_RAM + 0x05))	/* Digit 0 address     */
-#define	DISP_DIG6	*((volatile uchar*)(DISP_CHR_RAM + 0x06))	/* Digit 0 address     */
-#define	DISP_DIG7	*((volatile uchar*)(DISP_CHR_RAM + 0x07))	/* Digit 0 address     */
+#define DISP_DIG0	*((volatile uchar*)(DISP_CHR_RAM + 0x00))	/* Digit 0 address     */
+#define DISP_DIG1	*((volatile uchar*)(DISP_CHR_RAM + 0x01))	/* Digit 0 address     */
+#define DISP_DIG2	*((volatile uchar*)(DISP_CHR_RAM + 0x02))	/* Digit 0 address     */
+#define DISP_DIG3	*((volatile uchar*)(DISP_CHR_RAM + 0x03))	/* Digit 0 address     */
+#define DISP_DIG4	*((volatile uchar*)(DISP_CHR_RAM + 0x04))	/* Digit 0 address     */
+#define DISP_DIG5	*((volatile uchar*)(DISP_CHR_RAM + 0x05))	/* Digit 0 address     */
+#define DISP_DIG6	*((volatile uchar*)(DISP_CHR_RAM + 0x06))	/* Digit 0 address     */
+#define DISP_DIG7	*((volatile uchar*)(DISP_CHR_RAM + 0x07))	/* Digit 0 address     */
 
 
 /*-----------------------------------------------------------------------
@@ -436,14 +452,16 @@
  *-----------------------------------------------------------------------
  */
 #define CONFIG_PCI			/* include pci support			*/
-#undef CONFIG_PCI_PNP
+#undef	CONFIG_PCI_PNP
+#undef	CONFIG_PCI_SCAN_SHOW
 
-#define CONFIG_NET_MULTI		/* Multi ethernet cards support 	*/
+#define CONFIG_NET_MULTI		/* Multi ethernet cards support		*/
 
 #define CONFIG_EEPRO100
-#define CFG_RX_ETH_BUFFER	8               /* use 8 rx buffer on eepro100  */
+#define CFG_RX_ETH_BUFFER	8	/* use 8 rx buffer on eepro100	*/
 
-#define PCI_ENET0_IOADDR	0x00104000
+#define PCI_ENET0_IOADDR	0x82000000
 #define PCI_ENET0_MEMADDR	0x82000000
-#define	PCI_PLX9030_MEMADDR	0x82100000
+#define PCI_PLX9030_IOADDR	0x82100000
+#define PCI_PLX9030_MEMADDR	0x82100000
 #endif	/* __CONFIG_H */
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index a7d30f0..a91662c 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -35,6 +35,8 @@
 
 #define CFG_MPC5XXX_CLKIN	33000000 /* ... running at 33MHz */
 
+#define CONFIG_MISC_INIT_R
+
 #define BOOTFLAG_COLD		0x01	/* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM		0x02	/* Software reboot	     */
 
@@ -82,11 +84,37 @@
 
 #endif
 
+/* Partitions */
+#define CONFIG_DOS_PARTITION
+
+/* USB */
+#if 1
+#define CONFIG_USB_OHCI
+#define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
+#define CONFIG_USB_STORAGE
+#else
+#define ADD_USB_CMD             0
+#endif
+
+#if defined(CONFIG_BOOT_ROM)
+#define ADD_DOC_CMD             0
+#else
+#define ADD_DOC_CMD             CFG_CMD_DOC
+#endif
+
 /*
  * Supported commands
  */
-#define CONFIG_COMMANDS		(CONFIG_CMD_DFL | ADD_PCI_CMD | \
-				 CFG_CMD_I2C | CFG_CMD_EEPROM | CFG_CMD_DATE)
+#define CONFIG_COMMANDS		(CONFIG_CMD_DFL	| \
+				 CFG_CMD_EEPROM	| \
+				 CFG_CMD_FAT	| \
+				 CFG_CMD_I2C	| \
+				 CFG_CMD_IDE	| \
+				 ADD_DOC_CMD	| \
+				 ADD_PCI_CMD	| \
+				 CFG_CMD_DATE   | \
+				 CFG_CMD_BEDBUG	| \
+				 ADD_USB_CMD)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -95,8 +123,32 @@
  * Autobooting
  */
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-#define CONFIG_BOOTCOMMAND	"bootm 100000"	/* autoboot command */
-#define CONFIG_BOOTARGS		"root=/dev/ram rw"
+
+#define CONFIG_PREBOOT	"echo;"	\
+	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+	"echo"
+
+#undef	CONFIG_BOOTARGS
+
+#define	CONFIG_EXTRA_ENV_SETTINGS					\
+	"netdev=eth0\0"							\
+	"hostname=pm520\0"							\
+	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
+		"nfsroot=$(serverip):$(rootpath)\0"			\
+	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
+	"addip=setenv bootargs $(bootargs) "				\
+		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"	\
+		":$(hostname):$(netdev):off panic=1\0"			\
+	"flash_nfs=run nfsargs addip;"					\
+		"bootm $(kernel_addr)\0"				\
+	"flash_self=run ramargs addip;"					\
+		"bootm $(kernel_addr) $(ramdisk_addr)\0"		\
+	"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"	\
+	"rootpath=/opt/eldk30/ppc_82xx\0"					\
+	"bootfile=/tftpboot/PM520/uImage\0"				\
+	""
+
+#define CONFIG_BOOTCOMMAND	"run flash_self"
 
 #if defined(CONFIG_MPC5200)
 /*
@@ -128,11 +180,44 @@
 #define CFG_I2C_RTC_ADDR		0x51
 
 /*
- * Flash configuration
+ * Disk-On-Chip configuration
+ */
+
+#define CFG_DOC_SHORT_TIMEOUT
+#define CFG_MAX_DOC_DEVICE	1	/* Max number of DOC devices	*/
+
+#define CFG_DOC_SUPPORT_2000
+#define CFG_DOC_SUPPORT_MILLENNIUM
+#define CFG_DOC_BASE		0xE0000000
+#define CFG_DOC_SIZE		0x00100000
+
+#if defined(CONFIG_BOOT_ROM)
+/*
+ * Flash configuration (8,16 or 32 MB)
+ * TEXT base always at 0xFFF00000
+ * ENV_ADDR always at  0xFFF40000
+ * FLASH_BASE at 0xFC000000 for 32 MB
+ *               0xFD000000 for 16 MB
+ *               0xFD800000 for  8 MB
+ */
+#define CFG_FLASH_BASE		0xfc000000
+#define CFG_FLASH_SIZE		0x02000000
+#define CFG_BOOTROM_BASE	0xFFF00000
+#define CFG_BOOTROM_SIZE	0x00080000
+#define CFG_ENV_ADDR		(0xFDF00000 + 0x40000)
+#else
+/*
+ * Flash configuration (8,16 or 32 MB)
+ * TEXT base always at 0xFFF00000
+ * ENV_ADDR always at  0xFFF40000
+ * FLASH_BASE at 0xFE000000 for 32 MB
+ *               0xFF000000 for 16 MB
+ *               0xFF800000 for  8 MB
  */
-#define CFG_FLASH_BASE		0xff800000
-#define CFG_FLASH_SIZE		0x00800000
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x740000)
+#define CFG_FLASH_BASE		0xfe000000
+#define CFG_FLASH_SIZE		0x02000000
+#define CFG_ENV_ADDR		(0xFFF00000 + 0x40000)
+#endif
 #define CFG_MAX_FLASH_BANKS	1	/* max num of memory banks      */
 
 #define CFG_MAX_FLASH_SECT	128	/* max num of sects on one chip */
@@ -228,15 +313,68 @@
 #define CFG_HID0_FINAL		0
 #endif
 
+#if defined(CONFIG_BOOT_ROM)
+#define CFG_BOOTCS_START	CFG_BOOTROM_BASE
+#define CFG_BOOTCS_SIZE		CFG_BOOTROM_SIZE
+#define CFG_BOOTCS_CFG		0x00047800
+#define CFG_CS0_START		CFG_BOOTROM_BASE
+#define CFG_CS0_SIZE		CFG_BOOTROM_SIZE
+#define CFG_CS1_START		CFG_FLASH_BASE
+#define CFG_CS1_SIZE		CFG_FLASH_SIZE
+#define CFG_CS1_CFG		0x0004fb00
+#else
 #define CFG_BOOTCS_START	CFG_FLASH_BASE
 #define CFG_BOOTCS_SIZE		CFG_FLASH_SIZE
 #define CFG_BOOTCS_CFG		0x0004fb00
 #define CFG_CS0_START		CFG_FLASH_BASE
 #define CFG_CS0_SIZE		CFG_FLASH_SIZE
+#define CFG_CS1_START		CFG_DOC_BASE
+#define CFG_CS1_SIZE		CFG_DOC_SIZE
+#define CFG_CS1_CFG		0x00047800
+#endif
 
 #define CFG_CS_BURST		0x00000000
 #define CFG_CS_DEADCYCLE	0x33333333
 
 #define CFG_RESET_ADDRESS	0xff000000
 
+/*-----------------------------------------------------------------------
+ * USB stuff
+ *-----------------------------------------------------------------------
+ */
+#define CONFIG_USB_CLOCK	0x0001BBBB
+#define CONFIG_USB_CONFIG	0x00005000
+
+/*-----------------------------------------------------------------------
+ * IDE/ATA stuff Supports IDE harddisk
+ *-----------------------------------------------------------------------
+ */
+
+#undef  CONFIG_IDE_8xx_PCCARD		/* Use IDE with PC Card	Adapter	*/
+
+#undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/
+#undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/
+
+#undef	CONFIG_IDE_RESET		/* reset for ide supported	*/
+#define CONFIG_IDE_PREINIT
+
+#define CFG_IDE_MAXBUS		1	/* max. 1 IDE bus		*/
+#define CFG_IDE_MAXDEVICE	2	/* max. 2 drive per IDE bus	*/
+
+#define CFG_ATA_IDE0_OFFSET	0x0000
+
+#define CFG_ATA_BASE_ADDR	MPC5XXX_ATA
+
+/* Offset for data I/O			*/
+#define CFG_ATA_DATA_OFFSET	(0x0060)
+
+/* Offset for normal register accesses	*/
+#define CFG_ATA_REG_OFFSET	(CFG_ATA_DATA_OFFSET)
+
+/* Offset for alternate registers	*/
+#define CFG_ATA_ALT_OFFSET	(0x005C)
+
+/* Interval between registers                                                */
+#define CFG_ATA_STRIDE          4
+
 #endif /* __CONFIG_H */
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index ff63259..369842b 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -178,8 +178,6 @@
 #define CFG_ENV_SIZE		0x8000	/* Total Size of Environment Sector	*/
 #endif
 
-
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 9611d61..46c6fdd 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -229,7 +229,7 @@
 #else
 #define CFG_NS16550_CLK         1843200
 #endif
-                                                                                
+
 #define CFG_NS16550_COM1	(CFG_ISA_IO + CFG_NS87308_UART1_BASE)
 #define CFG_NS16550_COM2	(CFG_ISA_IO + CFG_NS87308_UART2_BASE)
 #define CFG_NS16550_COM3	(CFG_EUMB_ADDR + 0x4500)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 9d4ab2b..5cf092a 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -1,6 +1,6 @@
 /*
  * include/configs/mx1ads.h
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -43,17 +43,17 @@
 #define	CONFIG_MC9328		1	/* It's a Motorola MC9328 SoC 		*/
 #define CONFIG_MX1ADS		1	/* on a Motorola MX1ADS Board  		*/
 
-#define BOARD_LATE_INIT		1 
+#define BOARD_LATE_INIT		1
 
 
 #define USE_920T_MMU		1
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff 		*/
 
-#if 0 
+#if 0
 #define CFG_MX1_GPCR		0x000003AB	/* for MX1ADS 0L44N		*/
 #define CFG_MX1_GPCR		0x000003AB	/* for MX1ADS 0L44N		*/
 #define CFG_MX1_GPCR		0x000003AB	/* for MX1ADS 0L44N		*/
-#endif 
+#endif
 
 /*
  * Size of malloc() pool
@@ -73,7 +73,7 @@
  * select serial console configuration
  */
 
-#define CONFIG_UART1 		1 
+#define CONFIG_UART1 		1
 /* #define CONFIG_UART2		1	*/
 
 #define CONFIG_BAUDRATE		115200
@@ -90,13 +90,13 @@
 			/*CFG_CMD_I2C	 |*/ \
 			/*CFG_CMD_USB	 |*/ \
 			CFG_CMD_REGINFO  | \
-			CFG_CMD_ELF)  
+			CFG_CMD_ELF)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
 #define CONFIG_BOOTDELAY	3
-#define CONFIG_BOOTARGS    	"root=/dev/docbp mem=48M" 
+#define CONFIG_BOOTARGS    	"root=/dev/docbp mem=48M"
 #define CONFIG_ETHADDR		08:00:3e:26:0a:5c
 #define CONFIG_NETMASK          255.255.255.0
 #define CONFIG_IPADDR		192.168.0.22
@@ -113,10 +113,10 @@
 /*
  * Miscellaneous configurable options
  */
- 
+
 #define CFG_HUSH_PARSER         1
 #define CFG_PROMPT_HUSH_PS2	"> "
- 
+
 #define	CFG_LONGHELP				/* undef to save memory		*/
 
 #ifdef CFG_HUSH_PARSER
@@ -126,7 +126,7 @@
 #endif
 
 #define	CFG_CBSIZE		256		/* Console I/O Buffer Size	*/
-#define	CFG_PBSIZE 		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16) 
+#define	CFG_PBSIZE 		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16)
 						/* Print Buffer Size */
 #define	CFG_MAXARGS		16		/* max number of command args	*/
 #define CFG_BARGSIZE		CFG_CBSIZE	/* Boot Argument Buffer Size	*/
@@ -158,7 +158,7 @@
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
- 
+
 
 #define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of SDRAM 	*/
 #define PHYS_SDRAM_1		0x08000000 	/* SDRAM  on CSD0 		*/
@@ -178,7 +178,7 @@
 #define PHYS_FLASH_SIZE		0x01000000
 #define CFG_MAX_FLASH_SECT	(16)
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE+0x00ff0000)
- 
+
 #define	CFG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_SIZE		0x0f000	/* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE	0x100000
diff --git a/include/mc9328.h b/include/mc9328.h
index 5adbf2c..2a6e757 100644
--- a/include/mc9328.h
+++ b/include/mc9328.h
@@ -1,6 +1,6 @@
 /*
  * include/mc9328.h
- * 
+ *
  * (c) Copyright 2004
  * Techware Information Technology, Inc.
  * http://www.techware.com.tw/
@@ -14,7 +14,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -23,157 +23,139 @@
  * MA 02111-1307 USA
  */
 
-
 #ifndef __MC9328_H__
 #define __MC9328_H__
 
-typedef	volatile unsigned long	VU32;
-typedef	VU32	*		P_VU32;
+typedef volatile unsigned long	VU32;
+typedef VU32	*		P_VU32;
 
 #define __REG(x)		(*((volatile u32 *)(x)))
 
-
 /*
- * MX1 Chip selects & internal memory's 
+ * MX1 Chip selects & internal memory's
  */
-
-
-#define MX1_DMI_PHYS 	0x00000000	/* double map image 	*/
-#define MX1_BROM_PHYS	0x00100000	/* Bootstrape ROM 	*/
+#define MX1_DMI_PHYS	0x00000000	/* double map image	*/
+#define MX1_BROM_PHYS	0x00100000	/* Bootstrape ROM	*/
 #define MX1_ESRAM_PHYS	0x00300000	/* Embedded SRAM (128KB)*/
 
-#define MX1_CSD0_PHYS	0x08000000	/* CSD0 64MB (SDRAM) 	*/
-#define MX1_CSD1_PHYS	0x0C000000	/* CSD1 64MB (SDRAM) 	*/
-#define MX1_CS0_PHYS	0x10000000	/* CS0 32MB (Flash) 	*/
-#define MX1_CS1_PHYS	0x12000000	/* CS1 16MB (Flash) 	*/
-#define MX1_CS2_PHYS	0x13000000	/* CS2 16MB (Ext SRAM) 	*/
-#define MX1_CS3_PHYS	0x14000000	/* CS3 16MB (Spare) 	*/
-#define MX1_CS4_PHYS	0x15000000	/* CS4 16MB (Spare) 	*/
-#define MX1_CS5_PHYS	0x16000000	/* CS5 16MB (Spare) 	*/
-
-
+#define MX1_CSD0_PHYS	0x08000000	/* CSD0 64MB (SDRAM)	*/
+#define MX1_CSD1_PHYS	0x0C000000	/* CSD1 64MB (SDRAM)	*/
+#define MX1_CS0_PHYS	0x10000000	/* CS0 32MB (Flash)	*/
+#define MX1_CS1_PHYS	0x12000000	/* CS1 16MB (Flash)	*/
+#define MX1_CS2_PHYS	0x13000000	/* CS2 16MB (Ext SRAM)	*/
+#define MX1_CS3_PHYS	0x14000000	/* CS3 16MB (Spare)	*/
+#define MX1_CS4_PHYS	0x15000000	/* CS4 16MB (Spare)	*/
+#define MX1_CS5_PHYS	0x16000000	/* CS5 16MB (Spare)	*/
 
 /*
- * 	MX1 Watchdog registers
+ *	MX1 Watchdog registers
  */
-
-#define MX1_WCR		__REG(0x00201000)  /* Watchdog Control Register 	*/
+#define MX1_WCR		__REG(0x00201000)  /* Watchdog Control Register		*/
 #define MX1_WSR		__REG(0x00201004)  /* Watchdog Service Register		*/
-#define MX1_WSTR	__REG(0x00201008)  /* Watchdog Status Register 		*/
-
-
+#define MX1_WSTR	__REG(0x00201008)  /* Watchdog Status Register		*/
 
 /*
  *	MX1 Timer registers
  */
-
-#define MX1_TCTL1	__REG(0x00202000)  /* Timer 1 Control Register 		*/
-#define MX1_TPRER1	__REG(0x00202004)  /* Timer 1 Prescaler Register 	*/
-#define MX1_TCMP1	__REG(0x00202008)  /* Timer 1 Compare Register 		*/
-#define MX1_TCR1	__REG(0x0020200C)  /* Timer 1 Capture Register 		*/
-#define MX1_TCN1	__REG(0x00202010)  /* Timer 1 Counter Register 		*/
-#define MX1_TSTAT1	__REG(0x00202014)  /* Timer 1 Status Register 		*/
-
-
-#define MX1_TCTL2	__REG(0x00203000)  /* Timer 2 Control Register 		*/
-#define MX1_TPRER2	__REG(0x00203004)  /* Timer 2 Prescaler Register 	*/
-#define MX1_TCMP2	__REG(0x00203008)  /* Timer 2 Compare Register 		*/
-#define MX1_TCR2	__REG(0x0020300C)  /* Timer 2 Capture Register 		*/
-#define MX1_TCN2	__REG(0x00203010)  /* Timer 2 Counter Register 		*/
-#define MX1_TSTAT2	__REG(0x00203014)  /* Timer 2 Status Register 		*/
-
-
+#define MX1_TCTL1	__REG(0x00202000)  /* Timer 1 Control Register		*/
+#define MX1_TPRER1	__REG(0x00202004)  /* Timer 1 Prescaler Register	*/
+#define MX1_TCMP1	__REG(0x00202008)  /* Timer 1 Compare Register		*/
+#define MX1_TCR1	__REG(0x0020200C)  /* Timer 1 Capture Register		*/
+#define MX1_TCN1	__REG(0x00202010)  /* Timer 1 Counter Register		*/
+#define MX1_TSTAT1	__REG(0x00202014)  /* Timer 1 Status Register		*/
+
+#define MX1_TCTL2	__REG(0x00203000)  /* Timer 2 Control Register		*/
+#define MX1_TPRER2	__REG(0x00203004)  /* Timer 2 Prescaler Register	*/
+#define MX1_TCMP2	__REG(0x00203008)  /* Timer 2 Compare Register		*/
+#define MX1_TCR2	__REG(0x0020300C)  /* Timer 2 Capture Register		*/
+#define MX1_TCN2	__REG(0x00203010)  /* Timer 2 Counter Register		*/
+#define MX1_TSTAT2	__REG(0x00203014)  /* Timer 2 Status Register		*/
 
 /*
  *	MX1 RTC registers
  */
-
-#define MX1_HOURMIN	__REG(0x00204000)  /* RTC Hour & Min Counter Registers 	*/
-#define MX1_SECONDS	__REG(0x00204004)  /* RTC Seconds Counter Registers 	*/
-#define MX1_ALRM_HM	__REG(0x00204008)  /* RTC Hour & Min Alarm Registers 	*/
-#define MX1_ALRM_SEC	__REG(0x0020400C)  /* RTC Seconds Alarm Registers 	*/
-#define MX1_RCCTL	__REG(0x00204010)  /* RTC Control Registers	 	*/
-#define MX1_RTCISR	__REG(0x00204014)  /* RTC Interrupt Status Registers 	*/
-#define MX1_RTCIENR	__REG(0x00204018)  /* RTC Interrupt Enable Registers 	*/
-#define MX1_STPWCH	__REG(0x0020401C)  /* RTC Stopwatch Minutes Registers 	*/
-#define MX1_DAYR	__REG(0x00204020)  /* RTC Days Counter Registers 	*/
-#define MX1_DAYALARM	__REG(0x00204020)  /* RTC Day Alarm Registers 		*/
-
+#define MX1_HOURMIN	__REG(0x00204000)  /* RTC Hour & Min Counter Registers	*/
+#define MX1_SECONDS	__REG(0x00204004)  /* RTC Seconds Counter Registers	*/
+#define MX1_ALRM_HM	__REG(0x00204008)  /* RTC Hour & Min Alarm Registers	*/
+#define MX1_ALRM_SEC	__REG(0x0020400C)  /* RTC Seconds Alarm Registers	*/
+#define MX1_RCCTL	__REG(0x00204010)  /* RTC Control Registers		*/
+#define MX1_RTCISR	__REG(0x00204014)  /* RTC Interrupt Status Registers	*/
+#define MX1_RTCIENR	__REG(0x00204018)  /* RTC Interrupt Enable Registers	*/
+#define MX1_STPWCH	__REG(0x0020401C)  /* RTC Stopwatch Minutes Registers	*/
+#define MX1_DAYR	__REG(0x00204020)  /* RTC Days Counter Registers	*/
+#define MX1_DAYALARM	__REG(0x00204020)  /* RTC Day Alarm Registers		*/
 
 /*
  *	MX1 LCD Controller registers
  */
-
-#define MX1_SSA		__REG(0x00205000)  /* Screen Start Address Register 	*/
-#define MX1_SIZE	__REG(0x00205004)  /* Size Register 			*/
-#define MX1_VPW		__REG(0x00205008)  /* Virtual Page Width Register 	*/
-#define MX1_CPOS	__REG(0x0020500C)  /* LCD Cursor Position  Register 	*/
-#define MX1_LCWHB	__REG(0x00205010)  /* LCD Cursor Width Height & Blink Register 	*/
+#define MX1_SSA		__REG(0x00205000)  /* Screen Start Address Register	*/
+#define MX1_SIZE	__REG(0x00205004)  /* Size Register			*/
+#define MX1_VPW		__REG(0x00205008)  /* Virtual Page Width Register	*/
+#define MX1_CPOS	__REG(0x0020500C)  /* LCD Cursor Position  Register	*/
+#define MX1_LCWHB	__REG(0x00205010)  /* LCD Cursor Width Height & Blink Register	*/
 #define MX1_LCHCC	__REG(0x00205014)  /* LCD Color Cursor Mapping Register */
-#define MX1_PCR 	__REG(0x00205018)  /* LCD Panel Configuration Register 	*/
-#define MX1_HCR 	__REG(0x0020501C)  /* Horizontal Configuration Register */
-#define MX1_VCR 	__REG(0x00205020)  /* Vertical Configuration Register 	*/
-#define MX1_POS 	__REG(0x00205024)  /* Panning Offset Register 		*/
-#define MX1_LGPMR 	__REG(0x00205028)  /* LCD Gray Palette Mapping Register */
-#define MX1_PWMR 	__REG(0x0020502C)  /* PWM Contrast Control Register 	*/
-#define MX1_DMACR 	__REG(0x00205030)  /* DMA Control Register	 	*/
-#define MX1_RMCR 	__REG(0x00205034)  /* Refresh Mode Control Register	*/
-#define MX1_LCDICR 	__REG(0x00205038)  /* Interrupt Configuration Register	*/
-#define MX1_LCDISR 	__REG(0x00205040)  /* Interrupt Status Register		*/
-
+#define MX1_PCR		__REG(0x00205018)  /* LCD Panel Configuration Register	*/
+#define MX1_HCR		__REG(0x0020501C)  /* Horizontal Configuration Register */
+#define MX1_VCR		__REG(0x00205020)  /* Vertical Configuration Register	*/
+#define MX1_POS		__REG(0x00205024)  /* Panning Offset Register		*/
+#define MX1_LGPMR	__REG(0x00205028)  /* LCD Gray Palette Mapping Register */
+#define MX1_PWMR	__REG(0x0020502C)  /* PWM Contrast Control Register	*/
+#define MX1_DMACR	__REG(0x00205030)  /* DMA Control Register		*/
+#define MX1_RMCR	__REG(0x00205034)  /* Refresh Mode Control Register	*/
+#define MX1_LCDICR	__REG(0x00205038)  /* Interrupt Configuration Register	*/
+#define MX1_LCDISR	__REG(0x00205040)  /* Interrupt Status Register		*/
 
 /*
  *	MX1 UART registers
  */
 
 /* UART 1 */
-#define MX1_URX0D_1	__REG(0x00206000)  /* UART 1 Receiver Register 0 	*/
-#define MX1_URX1D_1	__REG(0x00206004)  /* UART 1 Receiver Register 1 	*/
-#define MX1_URX2D_1	__REG(0x00206008)  /* UART 1 Receiver Register 2 	*/
-#define MX1_URX3D_1	__REG(0x0020600C)  /* UART 1 Receiver Register 3 	*/
-#define MX1_URX4D_1	__REG(0x00206010)  /* UART 1 Receiver Register 4 	*/
-#define MX1_URX5D_1	__REG(0x00206014)  /* UART 1 Receiver Register 5 	*/
-#define MX1_URX6D_1	__REG(0x00206018)  /* UART 1 Receiver Register 6 	*/
-#define MX1_URX7D_1	__REG(0x0020601C)  /* UART 1 Receiver Register 7 	*/
-#define MX1_URX8D_1	__REG(0x00206020)  /* UART 1 Receiver Register 8 	*/
-#define MX1_URX9D_1	__REG(0x00206024)  /* UART 1 Receiver Register 9 	*/
-#define MX1_URX10D_1	__REG(0x00206028)  /* UART 1 Receiver Register 10 	*/
-#define MX1_URX11D_1	__REG(0x0020602C)  /* UART 1 Receiver Register 11 	*/
+#define MX1_URX0D_1	__REG(0x00206000)  /* UART 1 Receiver Register 0	*/
+#define MX1_URX1D_1	__REG(0x00206004)  /* UART 1 Receiver Register 1	*/
+#define MX1_URX2D_1	__REG(0x00206008)  /* UART 1 Receiver Register 2	*/
+#define MX1_URX3D_1	__REG(0x0020600C)  /* UART 1 Receiver Register 3	*/
+#define MX1_URX4D_1	__REG(0x00206010)  /* UART 1 Receiver Register 4	*/
+#define MX1_URX5D_1	__REG(0x00206014)  /* UART 1 Receiver Register 5	*/
+#define MX1_URX6D_1	__REG(0x00206018)  /* UART 1 Receiver Register 6	*/
+#define MX1_URX7D_1	__REG(0x0020601C)  /* UART 1 Receiver Register 7	*/
+#define MX1_URX8D_1	__REG(0x00206020)  /* UART 1 Receiver Register 8	*/
+#define MX1_URX9D_1	__REG(0x00206024)  /* UART 1 Receiver Register 9	*/
+#define MX1_URX10D_1	__REG(0x00206028)  /* UART 1 Receiver Register 10	*/
+#define MX1_URX11D_1	__REG(0x0020602C)  /* UART 1 Receiver Register 11	*/
 #define MX1_URX12D_1	__REG(0x00206030)  /* UART 1 Receiver Register 12	*/
 #define MX1_URX13D_1	__REG(0x00206034)  /* UART 1 Receiver Register 13	*/
-#define MX1_URX14D_1	__REG(0x00206038)  /* UART 1 Receiver Register 14 	*/
+#define MX1_URX14D_1	__REG(0x00206038)  /* UART 1 Receiver Register 14	*/
 #define MX1_URX15D_1	__REG(0x0020603c)  /* UART 1 Receiver Register 15	*/
 
-
-#define MX1_UTX0D_1	__REG(0x00206040)  /* UART 1 Transmitter Register 0 	*/
-#define MX1_UTX1D_1	__REG(0x00206044)  /* UART 1 Transmitter Register 1 	*/
-#define MX1_UTX2D_1	__REG(0x00206048)  /* UART 1 Transmitter Register 2 	*/
-#define MX1_UTX3D_1	__REG(0x0020604C)  /* UART 1 Transmitter Register 3 	*/
-#define MX1_UTX4D_1	__REG(0x00206050)  /* UART 1 Transmitter Register 4 	*/
-#define MX1_UTX5D_1	__REG(0x00206054)  /* UART 1 Transmitter Register 5 	*/
-#define MX1_UTX6D_1	__REG(0x00206058)  /* UART 1 Transmitter Register 6 	*/
-#define MX1_UTX7D_1	__REG(0x0020605C)  /* UART 1 Transmitter Register 7 	*/
-#define MX1_UTX8D_1	__REG(0x00206060)  /* UART 1 Transmitter Register 8 	*/
-#define MX1_UTX9D_1	__REG(0x00206064)  /* UART 1 Transmitter Register 9 	*/
-#define MX1_UTX10D_1	__REG(0x00206068)  /* UART 1 Transmitter Register 10 	*/
-#define MX1_UTX11D_1	__REG(0x0020606C)  /* UART 1 Transmitter Register 11 	*/
+#define MX1_UTX0D_1	__REG(0x00206040)  /* UART 1 Transmitter Register 0	*/
+#define MX1_UTX1D_1	__REG(0x00206044)  /* UART 1 Transmitter Register 1	*/
+#define MX1_UTX2D_1	__REG(0x00206048)  /* UART 1 Transmitter Register 2	*/
+#define MX1_UTX3D_1	__REG(0x0020604C)  /* UART 1 Transmitter Register 3	*/
+#define MX1_UTX4D_1	__REG(0x00206050)  /* UART 1 Transmitter Register 4	*/
+#define MX1_UTX5D_1	__REG(0x00206054)  /* UART 1 Transmitter Register 5	*/
+#define MX1_UTX6D_1	__REG(0x00206058)  /* UART 1 Transmitter Register 6	*/
+#define MX1_UTX7D_1	__REG(0x0020605C)  /* UART 1 Transmitter Register 7	*/
+#define MX1_UTX8D_1	__REG(0x00206060)  /* UART 1 Transmitter Register 8	*/
+#define MX1_UTX9D_1	__REG(0x00206064)  /* UART 1 Transmitter Register 9	*/
+#define MX1_UTX10D_1	__REG(0x00206068)  /* UART 1 Transmitter Register 10	*/
+#define MX1_UTX11D_1	__REG(0x0020606C)  /* UART 1 Transmitter Register 11	*/
 #define MX1_UTX12D_1	__REG(0x00206060)  /* UART 1 Transmitter Register 12	*/
 #define MX1_UTX13D_1	__REG(0x00206074)  /* UART 1 Transmitter Register 13	*/
-#define MX1_UTX14D_1	__REG(0x00206078)  /* UART 1 Transmitter Register 14 	*/
+#define MX1_UTX14D_1	__REG(0x00206078)  /* UART 1 Transmitter Register 14	*/
 #define MX1_UTX15D_1	__REG(0x0020607c)  /* UART 1 Transmitter Register 15	*/
 
 #define MX1_UCR1_1	__REG(0x00206080)  /* UART 1 Control Register 1		*/
 #define MX1_UCR2_1	__REG(0x00206084)  /* UART 1 Control Register 2		*/
 #define MX1_UCR3_1	__REG(0x00206088)  /* UART 1 Control Register 3		*/
 #define MX1_UCR4_1	__REG(0x0020608C)  /* UART 1 Control Register 4		*/
-#define MX1_UFCR_1	__REG(0x00206090)  /* UART 1 FIFO Control Register 	*/
+#define MX1_UFCR_1	__REG(0x00206090)  /* UART 1 FIFO Control Register	*/
 #define MX1_USR1_1	__REG(0x00206094)  /* UART 1 Status  Register 1		*/
 #define MX1_USR2_1	__REG(0x00206098)  /* UART 1 Status  Register 2		*/
-#define MX1_UESC_1	__REG(0x0020609C)  /* UART 1 Escape Character Register 	*/
-#define MX1_UTIM_1	__REG(0x002060A0)  /* UART 1 Escape Timer Register 	*/
-#define MX1_UBIR_1	__REG(0x002060A4)  /* UART 1 BRM Incremental Register 	*/
-#define MX1_UBMR_1	__REG(0x002060A8)  /* UART 1 BRM Modulator Register 	*/
-#define MX1_UBRC_1	__REG(0x002060AC)  /* UART 1 Baud Rate Count Register 	*/
+#define MX1_UESC_1	__REG(0x0020609C)  /* UART 1 Escape Character Register	*/
+#define MX1_UTIM_1	__REG(0x002060A0)  /* UART 1 Escape Timer Register	*/
+#define MX1_UBIR_1	__REG(0x002060A4)  /* UART 1 BRM Incremental Register	*/
+#define MX1_UBMR_1	__REG(0x002060A8)  /* UART 1 BRM Modulator Register	*/
+#define MX1_UBRC_1	__REG(0x002060AC)  /* UART 1 Baud Rate Count Register	*/
 #define MX1_BIPR1_1	__REG(0x002060B0)  /* UART 1 BRM Incremental Preset Register 1	*/
 #define MX1_BIPR2_1	__REG(0x002060B4)  /* UART 1 BRM Incremental Preset Register 2	*/
 #define MX1_BIPR3_1	__REG(0x002060B8)  /* UART 1 BRM Incremental Preset Register 3	*/
@@ -182,57 +164,55 @@ typedef	VU32	*		P_VU32;
 #define MX1_BMPR2_1	__REG(0x002060C4)  /* UART 1 BRM Modulator Preset Register 2	*/
 #define MX1_BMPR3_1	__REG(0x002060C8)  /* UART 1 BRM Modulator Preset Register 3	*/
 #define MX1_BMPR4_1	__REG(0x002060CC)  /* UART 1 BRM Modulator Preset Register 4	*/
-#define MX1_UTS_1	__REG(0x002060D0)  /* UART 1 Test Register 1	 	*/
-
+#define MX1_UTS_1	__REG(0x002060D0)  /* UART 1 Test Register 1		*/
 
 /* UART 2 */
-#define MX1_URX0D_2	__REG(0x00207000)  /* UART 2 Receiver Register 0 	*/
-#define MX1_URX1D_2	__REG(0x00207004)  /* UART 2 Receiver Register 1 	*/
-#define MX1_URX2D_2	__REG(0x00207008)  /* UART 2 Receiver Register 2 	*/
-#define MX1_URX3D_2	__REG(0x0020700C)  /* UART 2 Receiver Register 3 	*/
-#define MX1_URX4D_2	__REG(0x00207010)  /* UART 2 Receiver Register 4 	*/
-#define MX1_URX5D_2	__REG(0x00207014)  /* UART 2 Receiver Register 5 	*/
-#define MX1_URX6D_2	__REG(0x00207018)  /* UART 2 Receiver Register 6 	*/
-#define MX1_URX7D_2	__REG(0x0020701C)  /* UART 2 Receiver Register 7 	*/
-#define MX1_URX8D_2	__REG(0x00207020)  /* UART 2 Receiver Register 8 	*/
-#define MX1_URX9D_2	__REG(0x00207024)  /* UART 2 Receiver Register 9 	*/
-#define MX1_URX10D_2	__REG(0x00207028)  /* UART 2 Receiver Register 10 	*/
-#define MX1_URX11D_2	__REG(0x0020702C)  /* UART 2 Receiver Register 11 	*/
+#define MX1_URX0D_2	__REG(0x00207000)  /* UART 2 Receiver Register 0	*/
+#define MX1_URX1D_2	__REG(0x00207004)  /* UART 2 Receiver Register 1	*/
+#define MX1_URX2D_2	__REG(0x00207008)  /* UART 2 Receiver Register 2	*/
+#define MX1_URX3D_2	__REG(0x0020700C)  /* UART 2 Receiver Register 3	*/
+#define MX1_URX4D_2	__REG(0x00207010)  /* UART 2 Receiver Register 4	*/
+#define MX1_URX5D_2	__REG(0x00207014)  /* UART 2 Receiver Register 5	*/
+#define MX1_URX6D_2	__REG(0x00207018)  /* UART 2 Receiver Register 6	*/
+#define MX1_URX7D_2	__REG(0x0020701C)  /* UART 2 Receiver Register 7	*/
+#define MX1_URX8D_2	__REG(0x00207020)  /* UART 2 Receiver Register 8	*/
+#define MX1_URX9D_2	__REG(0x00207024)  /* UART 2 Receiver Register 9	*/
+#define MX1_URX10D_2	__REG(0x00207028)  /* UART 2 Receiver Register 10	*/
+#define MX1_URX11D_2	__REG(0x0020702C)  /* UART 2 Receiver Register 11	*/
 #define MX1_URX12D_2	__REG(0x00207030)  /* UART 2 Receiver Register 12	*/
 #define MX1_URX13D_2	__REG(0x00207034)  /* UART 2 Receiver Register 13	*/
-#define MX1_URX14D_2	__REG(0x00207038)  /* UART 2 Receiver Register 14 	*/
+#define MX1_URX14D_2	__REG(0x00207038)  /* UART 2 Receiver Register 14	*/
 #define MX1_URX15D_2	__REG(0x0020703c)  /* UART 2 Receiver Register 15	*/
 
-
-#define MX1_UTX0D_2	__REG(0x00207040)  /* UART 2 Transmitter Register 0 	*/
-#define MX1_UTX1D_2	__REG(0x00207044)  /* UART 2 Transmitter Register 1 	*/
-#define MX1_UTX2D_2	__REG(0x00207048)  /* UART 2 Transmitter Register 2 	*/
-#define MX1_UTX3D_2	__REG(0x0020704C)  /* UART 2 Transmitter Register 3 	*/
-#define MX1_UTX4D_2	__REG(0x00207050)  /* UART 2 Transmitter Register 4 	*/
-#define MX1_UTX5D_2	__REG(0x00207054)  /* UART 2 Transmitter Register 5 	*/
-#define MX1_UTX6D_2	__REG(0x00207058)  /* UART 2 Transmitter Register 6 	*/
-#define MX1_UTX7D_2	__REG(0x0020705C)  /* UART 2 Transmitter Register 7 	*/
-#define MX1_UTX8D_2	__REG(0x00207060)  /* UART 2 Transmitter Register 8 	*/
-#define MX1_UTX9D_2	__REG(0x00207064)  /* UART 2 Transmitter Register 9 	*/
-#define MX1_UTX10D_2	__REG(0x00207068)  /* UART 2 Transmitter Register 10 	*/
-#define MX1_UTX11D_2	__REG(0x0020706C)  /* UART 2 Transmitter Register 11 	*/
+#define MX1_UTX0D_2	__REG(0x00207040)  /* UART 2 Transmitter Register 0	*/
+#define MX1_UTX1D_2	__REG(0x00207044)  /* UART 2 Transmitter Register 1	*/
+#define MX1_UTX2D_2	__REG(0x00207048)  /* UART 2 Transmitter Register 2	*/
+#define MX1_UTX3D_2	__REG(0x0020704C)  /* UART 2 Transmitter Register 3	*/
+#define MX1_UTX4D_2	__REG(0x00207050)  /* UART 2 Transmitter Register 4	*/
+#define MX1_UTX5D_2	__REG(0x00207054)  /* UART 2 Transmitter Register 5	*/
+#define MX1_UTX6D_2	__REG(0x00207058)  /* UART 2 Transmitter Register 6	*/
+#define MX1_UTX7D_2	__REG(0x0020705C)  /* UART 2 Transmitter Register 7	*/
+#define MX1_UTX8D_2	__REG(0x00207060)  /* UART 2 Transmitter Register 8	*/
+#define MX1_UTX9D_2	__REG(0x00207064)  /* UART 2 Transmitter Register 9	*/
+#define MX1_UTX10D_2	__REG(0x00207068)  /* UART 2 Transmitter Register 10	*/
+#define MX1_UTX11D_2	__REG(0x0020706C)  /* UART 2 Transmitter Register 11	*/
 #define MX1_UTX12D_2	__REG(0x00207060)  /* UART 2 Transmitter Register 12	*/
 #define MX1_UTX13D_2	__REG(0x00207074)  /* UART 2 Transmitter Register 13	*/
-#define MX1_UTX14D_2	__REG(0x00207078)  /* UART 2 Transmitter Register 14 	*/
+#define MX1_UTX14D_2	__REG(0x00207078)  /* UART 2 Transmitter Register 14	*/
 #define MX1_UTX15D_2	__REG(0x0020707c)  /* UART 2 Transmitter Register 15	*/
 
 #define MX1_UCR1_2	__REG(0x00207080)  /* UART 2 Control Register 1		*/
 #define MX1_UCR2_2	__REG(0x00207084)  /* UART 2 Control Register 2		*/
 #define MX1_UCR3_2	__REG(0x00207088)  /* UART 2 Control Register 3		*/
 #define MX1_UCR4_2	__REG(0x0020708C)  /* UART 2 Control Register 4		*/
-#define MX1_UFCR_2	__REG(0x00207090)  /* UART 2 FIFO Control Register 	*/
+#define MX1_UFCR_2	__REG(0x00207090)  /* UART 2 FIFO Control Register	*/
 #define MX1_USR1_2	__REG(0x00207094)  /* UART 2 Status  Register 1		*/
 #define MX1_USR2_2	__REG(0x00207098)  /* UART 2 Status  Register 2		*/
-#define MX1_UESC_2	__REG(0x0020709C)  /* UART 2 Escape Character Register 	*/
-#define MX1_UTIM_2	__REG(0x002070A0)  /* UART 2 Escape Timer Register 	*/
-#define MX1_UBIR_2	__REG(0x002070A4)  /* UART 2 BRM Incremental Register 	*/
-#define MX1_UBMR_2	__REG(0x002070A8)  /* UART 2 BRM Modulator Register 	*/
-#define MX1_UBRC_2	__REG(0x002070AC)  /* UART 2 Baud Rate Count Register 	*/
+#define MX1_UESC_2	__REG(0x0020709C)  /* UART 2 Escape Character Register	*/
+#define MX1_UTIM_2	__REG(0x002070A0)  /* UART 2 Escape Timer Register	*/
+#define MX1_UBIR_2	__REG(0x002070A4)  /* UART 2 BRM Incremental Register	*/
+#define MX1_UBMR_2	__REG(0x002070A8)  /* UART 2 BRM Modulator Register	*/
+#define MX1_UBRC_2	__REG(0x002070AC)  /* UART 2 Baud Rate Count Register	*/
 #define MX1_BIPR1_2	__REG(0x002070B0)  /* UART 2 BRM Incremental Preset Register 1	*/
 #define MX1_BIPR2_2	__REG(0x002070B4)  /* UART 2 BRM Incremental Preset Register 2	*/
 #define MX1_BIPR3_2	__REG(0x002070B8)  /* UART 2 BRM Incremental Preset Register 3	*/
@@ -241,827 +221,684 @@ typedef	VU32	*		P_VU32;
 #define MX1_BMPR2_2	__REG(0x002070C4)  /* UART 2 BRM Modulator Preset Register 2	*/
 #define MX1_BMPR3_2	__REG(0x002070C8)  /* UART 2 BRM Modulator Preset Register 3	*/
 #define MX1_BMPR4_2	__REG(0x002070CC)  /* UART 2 BRM Modulator Preset Register 4	*/
-#define MX1_UTS_2	__REG(0x002070D0)  /* UART 2 Test Register 1	 	*/
-
+#define MX1_UTS_2	__REG(0x002070D0)  /* UART 2 Test Register 1		*/
 
 /*
  *	MX1 PWM registers
  */
-
-#define MX1_PWMC	__REG(0x00208000)  /* PWM Control Register 		*/
-#define MX1_PWMS	__REG(0x00208004)  /* PWM Sample Register 		*/
-#define MX1_PWMP	__REG(0x00208008)  /* PWM Period Register 		*/
-#define MX1_PWMCNT	__REG(0x0020800C)  /* PWM Counter Register 		*/
-
-
+#define MX1_PWMC	__REG(0x00208000)  /* PWM Control Register		*/
+#define MX1_PWMS	__REG(0x00208004)  /* PWM Sample Register		*/
+#define MX1_PWMP	__REG(0x00208008)  /* PWM Period Register		*/
+#define MX1_PWMCNT	__REG(0x0020800C)  /* PWM Counter Register		*/
 
 /*
  *	MX1 DMAC registers
  */
-
-#define MX1_DCR		__REG(0x00209000)  /* DMA Control Register 		*/
-#define MX1_DISR	__REG(0x00209004)  /* DMA Interrupt Status Register 	*/
-#define MX1_DIMR	__REG(0x00209008)  /* DMA Interrupt Mask Register 	*/
-#define MX1_DBTOSR	__REG(0x0020900C)  /* DMA Burst Time-Out Status Register 	*/
-#define MX1_DRTOSR	__REG(0x00209010)  /* DMA Request Time-Out Status Register 	*/
-#define MX1_DSESR	__REG(0x00209014)  /* DMA Request Time-Out Status Register 	*/
-#define MX1_DBOSR	__REG(0x00209018)  /* DMA Buffer Overflow Status Register 	*/
-#define MX1_DBTOCR	__REG(0x0020901C)  /* DMA Burst Time-Out Control Register 	*/
-
-#define MX1_WSRA	__REG(0x00209040)  /* DMA W-Size Register A 		*/
-#define MX1_XSRA	__REG(0x00209044)  /* DMA X-Size Register A 		*/
-#define MX1_YSRA	__REG(0x00209048)  /* DMA Y-Size Register A 		*/
-
-#define MX1_WSRB	__REG(0x0020904C)  /* DMA W-Size Register B 		*/
-#define MX1_XSRB	__REG(0x00209050)  /* DMA X-Size Register B 		*/
-#define MX1_YSRB	__REG(0x00209054)  /* DMA Y-Size Register B 		*/
+#define MX1_DCR		__REG(0x00209000)  /* DMA Control Register		*/
+#define MX1_DISR	__REG(0x00209004)  /* DMA Interrupt Status Register	*/
+#define MX1_DIMR	__REG(0x00209008)  /* DMA Interrupt Mask Register	*/
+#define MX1_DBTOSR	__REG(0x0020900C)  /* DMA Burst Time-Out Status Register	*/
+#define MX1_DRTOSR	__REG(0x00209010)  /* DMA Request Time-Out Status Register	*/
+#define MX1_DSESR	__REG(0x00209014)  /* DMA Request Time-Out Status Register	*/
+#define MX1_DBOSR	__REG(0x00209018)  /* DMA Buffer Overflow Status Register	*/
+#define MX1_DBTOCR	__REG(0x0020901C)  /* DMA Burst Time-Out Control Register	*/
+
+#define MX1_WSRA	__REG(0x00209040)  /* DMA W-Size Register A		*/
+#define MX1_XSRA	__REG(0x00209044)  /* DMA X-Size Register A		*/
+#define MX1_YSRA	__REG(0x00209048)  /* DMA Y-Size Register A		*/
+
+#define MX1_WSRB	__REG(0x0020904C)  /* DMA W-Size Register B		*/
+#define MX1_XSRB	__REG(0x00209050)  /* DMA X-Size Register B		*/
+#define MX1_YSRB	__REG(0x00209054)  /* DMA Y-Size Register B		*/
 
 /* Channel 0 */
 
 #define MX1_SAR0	__REG(0x00209080)  /* Channel 0 Source Address Register */
-#define MX1_DAR0	__REG(0x00209084)  /* Channel 0 Destination Address Register 	*/
-#define MX1_CNTR0	__REG(0x00209088)  /* Channel 0 Count Register 		*/
-#define MX1_CCR0	__REG(0x0020908C)  /* Channel 0 Control Register 	*/
-#define MX1_RSSR0	__REG(0x00209090)  /* Channel 0 Request Source Select Register 	*/
-#define MX1_BLR0	__REG(0x00209094)  /* Channel 0 Burst Length  Register 	*/
-#define MX1_RTOR0	__REG(0x00209098)  /* Channel 0 Request Time-Out Register 	*/
-#define MX1_BUCR0	__REG(0x00209098)  /* Channel 0 Bus Utilization Control Register 	*/
-
+#define MX1_DAR0	__REG(0x00209084)  /* Channel 0 Destination Address Register	*/
+#define MX1_CNTR0	__REG(0x00209088)  /* Channel 0 Count Register		*/
+#define MX1_CCR0	__REG(0x0020908C)  /* Channel 0 Control Register	*/
+#define MX1_RSSR0	__REG(0x00209090)  /* Channel 0 Request Source Select Register	*/
+#define MX1_BLR0	__REG(0x00209094)  /* Channel 0 Burst Length  Register	*/
+#define MX1_RTOR0	__REG(0x00209098)  /* Channel 0 Request Time-Out Register	*/
+#define MX1_BUCR0	__REG(0x00209098)  /* Channel 0 Bus Utilization Control Register	*/
 
 /* Channel 1 */
 
 #define MX1_SAR1	__REG(0x002090C0)  /* Channel 1 Source Address Register */
-#define MX1_DAR1	__REG(0x002090C4)  /* Channel 1 Destination Address Register 	*/
-#define MX1_CNTR1	__REG(0x002090C8)  /* Channel 1 Count Register 		*/
-#define MX1_CCR1	__REG(0x002090CC)  /* Channel 1 Control Register 	*/
-#define MX1_RSSR1	__REG(0x002090D0)  /* Channel 1 Request Source Select Register 	*/
-#define MX1_BLR1	__REG(0x002090D4)  /* Channel 1 Burst Length  Register 	*/
-#define MX1_RTOR1	__REG(0x002090D8)  /* Channel 1 Request Time-Out Register 	*/
-#define MX1_BUCR1	__REG(0x002090D8)  /* Channel 1 Bus Utilization Control Register 	*/
-
+#define MX1_DAR1	__REG(0x002090C4)  /* Channel 1 Destination Address Register	*/
+#define MX1_CNTR1	__REG(0x002090C8)  /* Channel 1 Count Register		*/
+#define MX1_CCR1	__REG(0x002090CC)  /* Channel 1 Control Register	*/
+#define MX1_RSSR1	__REG(0x002090D0)  /* Channel 1 Request Source Select Register	*/
+#define MX1_BLR1	__REG(0x002090D4)  /* Channel 1 Burst Length  Register	*/
+#define MX1_RTOR1	__REG(0x002090D8)  /* Channel 1 Request Time-Out Register	*/
+#define MX1_BUCR1	__REG(0x002090D8)  /* Channel 1 Bus Utilization Control Register	*/
 
 /* Channel 2 */
 
 #define MX1_SAR2	__REG(0x00209100)  /* Channel 2 Source Address Register */
-#define MX1_DAR2	__REG(0x00209104)  /* Channel 2 Destination Address Register 	*/
-#define MX1_CNTR2	__REG(0x00209108)  /* Channel 2 Count Register 		*/
-#define MX1_CCR2	__REG(0x0020910C)  /* Channel 2 Control Register 	*/
-#define MX1_RSSR2	__REG(0x00209110)  /* Channel 2 Request Source Select Register 	*/
-#define MX1_BLR2	__REG(0x00209114)  /* Channel 2 Burst Length  Register 	*/
-#define MX1_RTOR2	__REG(0x00209118)  /* Channel 2 Request Time-Out Register 	*/
-#define MX1_BUCR2	__REG(0x00209118)  /* Channel 2 Bus Utilization Control Register 	*/
-
-
+#define MX1_DAR2	__REG(0x00209104)  /* Channel 2 Destination Address Register	*/
+#define MX1_CNTR2	__REG(0x00209108)  /* Channel 2 Count Register		*/
+#define MX1_CCR2	__REG(0x0020910C)  /* Channel 2 Control Register	*/
+#define MX1_RSSR2	__REG(0x00209110)  /* Channel 2 Request Source Select Register	*/
+#define MX1_BLR2	__REG(0x00209114)  /* Channel 2 Burst Length  Register	*/
+#define MX1_RTOR2	__REG(0x00209118)  /* Channel 2 Request Time-Out Register	*/
+#define MX1_BUCR2	__REG(0x00209118)  /* Channel 2 Bus Utilization Control Register	*/
 
 /* Channel 3 */
 
 #define MX1_SAR3	__REG(0x00209140)  /* Channel 3 Source Address Register */
-#define MX1_DAR3	__REG(0x00209144)  /* Channel 3 Destination Address Register 	*/
-#define MX1_CNTR3	__REG(0x00209148)  /* Channel 3 Count Register 		*/
-#define MX1_CCR3	__REG(0x0020914C)  /* Channel 3 Control Register 	*/
-#define MX1_RSSR3	__REG(0x00209150)  /* Channel 3 Request Source Select Register 	*/
-#define MX1_BLR3	__REG(0x00209154)  /* Channel 3 Burst Length  Register 	*/
-#define MX1_RTOR3	__REG(0x00209158)  /* Channel 3 Request Time-Out Register 	*/
-#define MX1_BUCR3	__REG(0x00209158)  /* Channel 3 Bus Utilization Control Register 	*/
-
+#define MX1_DAR3	__REG(0x00209144)  /* Channel 3 Destination Address Register	*/
+#define MX1_CNTR3	__REG(0x00209148)  /* Channel 3 Count Register		*/
+#define MX1_CCR3	__REG(0x0020914C)  /* Channel 3 Control Register	*/
+#define MX1_RSSR3	__REG(0x00209150)  /* Channel 3 Request Source Select Register	*/
+#define MX1_BLR3	__REG(0x00209154)  /* Channel 3 Burst Length  Register	*/
+#define MX1_RTOR3	__REG(0x00209158)  /* Channel 3 Request Time-Out Register	*/
+#define MX1_BUCR3	__REG(0x00209158)  /* Channel 3 Bus Utilization Control Register	*/
 
 /* Channel 4 */
 
 #define MX1_SAR4	__REG(0x00209180)  /* Channel 4 Source Address Register */
-#define MX1_DAR4	__REG(0x00209184)  /* Channel 4 Destination Address Register 	*/
-#define MX1_CNTR4	__REG(0x00209188)  /* Channel 4 Count Register 		*/
-#define MX1_CCR4	__REG(0x0020918C)  /* Channel 4 Control Register 	*/
-#define MX1_RSSR4	__REG(0x00209190)  /* Channel 4 Request Source Select Register 	*/
-#define MX1_BLR4	__REG(0x00209194)  /* Channel 4 Burst Length  Register 	*/
-#define MX1_RTOR4	__REG(0x00209198)  /* Channel 4 Request Time-Out Register 	*/
-#define MX1_BUCR4	__REG(0x00209198)  /* Channel 4 Bus Utilization Control Register 	*/
-
+#define MX1_DAR4	__REG(0x00209184)  /* Channel 4 Destination Address Register	*/
+#define MX1_CNTR4	__REG(0x00209188)  /* Channel 4 Count Register		*/
+#define MX1_CCR4	__REG(0x0020918C)  /* Channel 4 Control Register	*/
+#define MX1_RSSR4	__REG(0x00209190)  /* Channel 4 Request Source Select Register	*/
+#define MX1_BLR4	__REG(0x00209194)  /* Channel 4 Burst Length  Register	*/
+#define MX1_RTOR4	__REG(0x00209198)  /* Channel 4 Request Time-Out Register	*/
+#define MX1_BUCR4	__REG(0x00209198)  /* Channel 4 Bus Utilization Control Register	*/
 
 /* Channel 5 */
 
 #define MX1_SAR5	__REG(0x002091C0)  /* Channel 5 Source Address Register */
-#define MX1_DAR5	__REG(0x002091C4)  /* Channel 5 Destination Address Register 	*/
-#define MX1_CNTR5	__REG(0x002091C8)  /* Channel 5 Count Register 		*/
-#define MX1_CCR5	__REG(0x002091CC)  /* Channel 5 Control Register 	*/
-#define MX1_RSSR5	__REG(0x002091D0)  /* Channel 5 Request Source Select Register 	*/
-#define MX1_BLR5	__REG(0x002091D4)  /* Channel 5 Burst Length  Register 	*/
-#define MX1_RTOR5	__REG(0x002091D8)  /* Channel 5 Request Time-Out Register 	*/
-#define MX1_BUCR5	__REG(0x002091D8)  /* Channel 5 Bus Utilization Control Register 	*/
-
+#define MX1_DAR5	__REG(0x002091C4)  /* Channel 5 Destination Address Register	*/
+#define MX1_CNTR5	__REG(0x002091C8)  /* Channel 5 Count Register		*/
+#define MX1_CCR5	__REG(0x002091CC)  /* Channel 5 Control Register	*/
+#define MX1_RSSR5	__REG(0x002091D0)  /* Channel 5 Request Source Select Register	*/
+#define MX1_BLR5	__REG(0x002091D4)  /* Channel 5 Burst Length  Register	*/
+#define MX1_RTOR5	__REG(0x002091D8)  /* Channel 5 Request Time-Out Register	*/
+#define MX1_BUCR5	__REG(0x002091D8)  /* Channel 5 Bus Utilization Control Register	*/
 
 /* Channel 6 */
 
 #define MX1_SAR6	__REG(0x00209200)  /* Channel 6 Source Address Register */
-#define MX1_DAR6	__REG(0x00209204)  /* Channel 6 Destination Address Register 	*/
-#define MX1_CNTR6	__REG(0x00209208)  /* Channel 6 Count Register 		*/
-#define MX1_CCR6	__REG(0x0020920C)  /* Channel 6 Control Register 	*/
-#define MX1_RSSR6	__REG(0x00209210)  /* Channel 6 Request Source Select Register 	*/
-#define MX1_BLR6	__REG(0x00209214)  /* Channel 6 Burst Length  Register 	*/
-#define MX1_RTOR6	__REG(0x00209218)  /* Channel 6 Request Time-Out Register 	*/
-#define MX1_BUCR6	__REG(0x00209218)  /* Channel 6 Bus Utilization Control Register 	*/
-
+#define MX1_DAR6	__REG(0x00209204)  /* Channel 6 Destination Address Register	*/
+#define MX1_CNTR6	__REG(0x00209208)  /* Channel 6 Count Register		*/
+#define MX1_CCR6	__REG(0x0020920C)  /* Channel 6 Control Register	*/
+#define MX1_RSSR6	__REG(0x00209210)  /* Channel 6 Request Source Select Register	*/
+#define MX1_BLR6	__REG(0x00209214)  /* Channel 6 Burst Length  Register	*/
+#define MX1_RTOR6	__REG(0x00209218)  /* Channel 6 Request Time-Out Register	*/
+#define MX1_BUCR6	__REG(0x00209218)  /* Channel 6 Bus Utilization Control Register	*/
 
 /* Channel 7 */
 
 #define MX1_SAR7	__REG(0x00209240)  /* Channel 7 Source Address Register */
-#define MX1_DAR7	__REG(0x00209244)  /* Channel 7 Destination Address Register 	*/
-#define MX1_CNTR7	__REG(0x00209248)  /* Channel 7 Count Register 		*/
-#define MX1_CCR7	__REG(0x0020924C)  /* Channel 7 Control Register 	*/
-#define MX1_RSSR7	__REG(0x00209250)  /* Channel 7 Request Source Select Register 	*/
-#define MX1_BLR7	__REG(0x00209254)  /* Channel 7 Burst Length  Register 	*/
-#define MX1_RTOR7	__REG(0x00209258)  /* Channel 7 Request Time-Out Register 	*/
-#define MX1_BUCR7	__REG(0x00209258)  /* Channel 7 Bus Utilization Control Register 	*/
-
+#define MX1_DAR7	__REG(0x00209244)  /* Channel 7 Destination Address Register	*/
+#define MX1_CNTR7	__REG(0x00209248)  /* Channel 7 Count Register		*/
+#define MX1_CCR7	__REG(0x0020924C)  /* Channel 7 Control Register	*/
+#define MX1_RSSR7	__REG(0x00209250)  /* Channel 7 Request Source Select Register	*/
+#define MX1_BLR7	__REG(0x00209254)  /* Channel 7 Burst Length  Register	*/
+#define MX1_RTOR7	__REG(0x00209258)  /* Channel 7 Request Time-Out Register	*/
+#define MX1_BUCR7	__REG(0x00209258)  /* Channel 7 Bus Utilization Control Register	*/
 
 /* Channel 8 */
 
 #define MX1_SAR8	__REG(0x00209280)  /* Channel 8 Source Address Register */
-#define MX1_DAR8	__REG(0x00209284)  /* Channel 8 Destination Address Register 	*/
-#define MX1_CNTR8	__REG(0x00209288)  /* Channel 8 Count Register 		*/
-#define MX1_CCR8	__REG(0x0020928C)  /* Channel 8 Control Register 	*/
-#define MX1_RSSR8	__REG(0x00209290)  /* Channel 8 Request Source Select Register 	*/
-#define MX1_BLR8	__REG(0x00209294)  /* Channel 8 Burst Length  Register 	*/
-#define MX1_RTOR8	__REG(0x00209298)  /* Channel 8 Request Time-Out Register 	*/
-#define MX1_BUCR8	__REG(0x00209298)  /* Channel 8 Bus Utilization Control Register 	*/
-
+#define MX1_DAR8	__REG(0x00209284)  /* Channel 8 Destination Address Register	*/
+#define MX1_CNTR8	__REG(0x00209288)  /* Channel 8 Count Register		*/
+#define MX1_CCR8	__REG(0x0020928C)  /* Channel 8 Control Register	*/
+#define MX1_RSSR8	__REG(0x00209290)  /* Channel 8 Request Source Select Register	*/
+#define MX1_BLR8	__REG(0x00209294)  /* Channel 8 Burst Length  Register	*/
+#define MX1_RTOR8	__REG(0x00209298)  /* Channel 8 Request Time-Out Register	*/
+#define MX1_BUCR8	__REG(0x00209298)  /* Channel 8 Bus Utilization Control Register	*/
 
 /* Channel 9 */
 
 #define MX1_SAR9	__REG(0x002092C0)  /* Channel 9 Source Address Register */
-#define MX1_DAR9	__REG(0x002092C4)  /* Channel 9 Destination Address Register 	*/
-#define MX1_CNTR9	__REG(0x002092C8)  /* Channel 9 Count Register 		*/
-#define MX1_CCR9	__REG(0x002092CC)  /* Channel 9 Control Register 	*/
-#define MX1_RSSR9	__REG(0x002092D0)  /* Channel 9 Request Source Select Register 	*/
-#define MX1_BLR9	__REG(0x002092D4)  /* Channel 9 Burst Length  Register 	*/
-#define MX1_RTOR9	__REG(0x002092D8)  /* Channel 9 Request Time-Out Register 	*/
-#define MX1_BUCR9	__REG(0x002092D8)  /* Channel 9 Bus Utilization Control Register 	*/
-
+#define MX1_DAR9	__REG(0x002092C4)  /* Channel 9 Destination Address Register	*/
+#define MX1_CNTR9	__REG(0x002092C8)  /* Channel 9 Count Register		*/
+#define MX1_CCR9	__REG(0x002092CC)  /* Channel 9 Control Register	*/
+#define MX1_RSSR9	__REG(0x002092D0)  /* Channel 9 Request Source Select Register	*/
+#define MX1_BLR9	__REG(0x002092D4)  /* Channel 9 Burst Length  Register	*/
+#define MX1_RTOR9	__REG(0x002092D8)  /* Channel 9 Request Time-Out Register	*/
+#define MX1_BUCR9	__REG(0x002092D8)  /* Channel 9 Bus Utilization Control Register	*/
 
 /* Channel 10 */
 
 #define MX1_SAR10	__REG(0x00209300)  /* Channel 10 Source Address Register */
-#define MX1_DAR10	__REG(0x00209304)  /* Channel 10 Destination Address Register 	*/
-#define MX1_CNTR10	__REG(0x00209308)  /* Channel 10 Count Register 		*/
-#define MX1_CCR10	__REG(0x0020930C)  /* Channel 10 Control Register 	*/
-#define MX1_RSSR10	__REG(0x00209310)  /* Channel 10 Request Source Select Register 	*/
-#define MX1_BLR10	__REG(0x00209314)  /* Channel 10 Burst Length  Register 	*/
-#define MX1_RTOR10	__REG(0x00209318)  /* Channel 10 Request Time-Out Register 	*/
-#define MX1_BUCR10	__REG(0x00209318)  /* Channel 10 Bus Utilization Control Register 	*/
-
-
-#define MX1_TCR		__REG(0x00209340)  /* Test Control Register 		*/
-#define MX1_TFIFOAR	__REG(0x00209344)  /* Test FIFO A  Register 		*/
-#define MX1_TDRR	__REG(0x00209348)  /* Test DMA Request Register 	*/
-#define MX1_TDIPR	__REG(0x0020934C)  /* Test DMA In Progress Register 	*/
-#define MX1_TFIFOBR	__REG(0x00209350)  /* Test FIFO B Register 		*/
-
-
+#define MX1_DAR10	__REG(0x00209304)  /* Channel 10 Destination Address Register	*/
+#define MX1_CNTR10	__REG(0x00209308)  /* Channel 10 Count Register			*/
+#define MX1_CCR10	__REG(0x0020930C)  /* Channel 10 Control Register	*/
+#define MX1_RSSR10	__REG(0x00209310)  /* Channel 10 Request Source Select Register		*/
+#define MX1_BLR10	__REG(0x00209314)  /* Channel 10 Burst Length  Register		*/
+#define MX1_RTOR10	__REG(0x00209318)  /* Channel 10 Request Time-Out Register	*/
+#define MX1_BUCR10	__REG(0x00209318)  /* Channel 10 Bus Utilization Control Register	*/
+
+#define MX1_TCR		__REG(0x00209340)  /* Test Control Register		*/
+#define MX1_TFIFOAR	__REG(0x00209344)  /* Test FIFO A  Register		*/
+#define MX1_TDRR	__REG(0x00209348)  /* Test DMA Request Register		*/
+#define MX1_TDIPR	__REG(0x0020934C)  /* Test DMA In Progress Register	*/
+#define MX1_TFIFOBR	__REG(0x00209350)  /* Test FIFO B Register		*/
 
 /*
  *	MX1 SIM registers
  */
 
-#define MX1_PORT_CNTL	__REG(0x00211000)  /* Port Control Register 		*/
-#define MX1_CNTL	__REG(0x00211004)  /* Control Register	 		*/
-#define MX1_RCV_THRESHOLD __REG(0x00211008)/* Receive Threshold  Register	*/
-#define MX1_ENABLE 	__REG(0x0021100C)  /* Transmit/Receive Enable Register	*/
-#define MX1_XMT_STATUS  __REG(0x00211010)  /* Transmit Status  Register		*/
-#define MX1_RCV_STATUS  __REG(0x00211014)  /* Receive Status  Register		*/
-#define MX1_SIM_INT_MASK  	__REG(0x00211018)  /* Interrupt Mask Register		*/
-#define MX1_XMT_BUF  	__REG(0x0021101C)  /* Port Transmit Buffer Register	*/
-#define MX1_RCV_BUF  	__REG(0x00211020)  /* Receive Buffer Register		*/
+#define MX1_PORT_CNTL	__REG(0x00211000)  /* Port Control Register		*/
+#define MX1_CNTL	__REG(0x00211004)  /* Control Register			*/
+#define MX1_RCV_THRESHOLD __REG(0x00211008)/* Receive Threshold	 Register	*/
+#define MX1_ENABLE	__REG(0x0021100C)  /* Transmit/Receive Enable Register	*/
+#define MX1_XMT_STATUS	__REG(0x00211010)  /* Transmit Status  Register		*/
+#define MX1_RCV_STATUS	__REG(0x00211014)  /* Receive Status  Register		*/
+#define MX1_SIM_INT_MASK	__REG(0x00211018)  /* Interrupt Mask Register		*/
+#define MX1_XMT_BUF	__REG(0x0021101C)  /* Port Transmit Buffer Register	*/
+#define MX1_RCV_BUF	__REG(0x00211020)  /* Receive Buffer Register		*/
 #define MX1_PORT_DETECT __REG(0x00211024)  /* Detect Register			*/
 #define MX1_XMT_THRESHOLD __REG(0x00211028)/* Transmit Threshold Register	*/
-#define MX1_GUARD_CNTL  __REG(0x0021102C)  /* Transmit Guard Control  Register	*/
-#define MX1_OD_CONFIG	__REG(0x00211030)  /* Open-Drain Configuration Control Register	*/
+#define MX1_GUARD_CNTL	__REG(0x0021102C)  /* Transmit Guard Control  Register	*/
+#define MX1_OD_CONFIG	__REG(0x00211030)  /* Open-Drain Configuration Control Register */
 #define MX1_RESET_CNTL	__REG(0x00211034)  /* Reset  Control Register		*/
 #define MX1_CHAR_WAIT	__REG(0x00211038)  /* Charactor Wait Timer Register	*/
-#define MX1_GPCNT	__REG(0x0021103C)  /* General Purpose Counter  Register	*/
+#define MX1_GPCNT	__REG(0x0021103C)  /* General Purpose Counter  Register */
 #define MX1_DIVISOR	__REG(0x00211040)  /* Divisor Register			*/
 
-
 /*
  *	MX1 USBD registers
  */
 
-#define MX1_USB_FRAME	__REG(0x00212000)  /* USB Frame Number and Match Register 	*/
-#define MX1_USB_SPEC	__REG(0x00212004)  /* USB Spec & Release Number Register 	*/
-#define MX1_USB_STAT	__REG(0x00212008)  /* USB Status Register	 	*/
-#define MX1_USB_CTRL	__REG(0x0021200C)  /* USB Control Register	 	*/
-#define MX1_USB_DADR	__REG(0x00212010)  /* USB Descriptor RAM Address Register 	*/
+#define MX1_USB_FRAME	__REG(0x00212000)  /* USB Frame Number and Match Register	*/
+#define MX1_USB_SPEC	__REG(0x00212004)  /* USB Spec & Release Number Register	*/
+#define MX1_USB_STAT	__REG(0x00212008)  /* USB Status Register		*/
+#define MX1_USB_CTRL	__REG(0x0021200C)  /* USB Control Register		*/
+#define MX1_USB_DADR	__REG(0x00212010)  /* USB Descriptor RAM Address Register	*/
 #define MX1_USB_DDAT	__REG(0x00212014)  /* USB Descriptor RAM/Endpoint buffer Data  Register */
-#define MX1_USB_INTR 	__REG(0x00212018)  /* USB Interrupt Status Register 	*/
-#define MX1_USB_MASK 	__REG(0x0021201C)  /* USB Interrupt Mask Register 	*/
-#define MX1_USB_ENAB 	__REG(0x00212024)  /* USB Enable Register 		*/
-
+#define MX1_USB_INTR	__REG(0x00212018)  /* USB Interrupt Status Register	*/
+#define MX1_USB_MASK	__REG(0x0021201C)  /* USB Interrupt Mask Register	*/
+#define MX1_USB_ENAB	__REG(0x00212024)  /* USB Enable Register		*/
 
 /* Endpoint 0  */
 #define MX1_USB_EP0_STAT __REG(0x00212030) /* Endpoint 0 Status/Control Register	*/
 #define MX1_USB_EP0_INTR __REG(0x00212034) /* Endpoint 0 Interrupt Status  Register	*/
-#define MX1_USB_EP0_MASK __REG(0x00212038) /* Endpoint 0 Interrupt Mask  Register	*/
+#define MX1_USB_EP0_MASK __REG(0x00212038) /* Endpoint 0 Interrupt Mask	 Register	*/
 #define MX1_USB_EP0_FDAT __REG(0x0021203C) /* Endpoint 0 FIFO Data Register	*/
 #define MX1_USB_EP0_FSTAT __REG(0x00212040) /* Endpoint 0 FIFO Status Register	*/
-#define MX1_USB_EP0_FCTRL __REG(0x00212044) /* Endpoint 0 FIFO Control Register	*/
+#define MX1_USB_EP0_FCTRL __REG(0x00212044) /* Endpoint 0 FIFO Control Register */
 #define MX1_USB_EP0_LRFP __REG(0x00212048) /* Endpoint 0 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP0_LWFP __REG(0x0021204C) /* Endpoint 0 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP0_FALRM __REG(0x00212050) /* Endpoint 0 FIFO Alarm  Register	*/
 #define MX1_USB_EP0_FRDP __REG(0x00212054) /* Endpoint 0 FIFO Read Pointer Register	*/
 #define MX1_USB_EP0_FWRP __REG(0x00212058) /* Endpoint 0 FIFO Write Pointer Register	*/
 
-
 /* Endpoint 1  */
 #define MX1_USB_EP1_STAT __REG(0x00212060) /* Endpoint 1 Status/Control Register	*/
 #define MX1_USB_EP1_INTR __REG(0x00212064) /* Endpoint 1 Interrupt Status  Register	*/
-#define MX1_USB_EP1_MASK __REG(0x00212068) /* Endpoint 1 Interrupt Mask  Register	*/
+#define MX1_USB_EP1_MASK __REG(0x00212068) /* Endpoint 1 Interrupt Mask	 Register	*/
 #define MX1_USB_EP1_FDAT __REG(0x0021206C) /* Endpoint 1 FIFO Data Register	*/
 #define MX1_USB_EP1_FSTAT __REG(0x00212070) /* Endpoint 1 FIFO Status Register	*/
-#define MX1_USB_EP1_FCTRL __REG(0x00212074) /* Endpoint 1 FIFO Control Register	*/
+#define MX1_USB_EP1_FCTRL __REG(0x00212074) /* Endpoint 1 FIFO Control Register */
 #define MX1_USB_EP1_LRFP __REG(0x00212078) /* Endpoint 1 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP1_LWFP __REG(0x0021207C) /* Endpoint 1 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP1_FALRM __REG(0x00212080) /* Endpoint 1 FIFO Alarm  Register	*/
 #define MX1_USB_EP1_FRDP __REG(0x00212084) /* Endpoint 1 FIFO Read Pointer Register	*/
 #define MX1_USB_EP1_FWRP __REG(0x00212088) /* Endpoint 1 FIFO Write Pointer Register	*/
 
-
 /* Endpoint 2  */
 #define MX1_USB_EP2_STAT __REG(0x00212090) /* Endpoint 2 Status/Control Register	*/
 #define MX1_USB_EP2_INTR __REG(0x00212094) /* Endpoint 2 Interrupt Status  Register	*/
-#define MX1_USB_EP2_MASK __REG(0x00212098) /* Endpoint 2 Interrupt Mask  Register	*/
+#define MX1_USB_EP2_MASK __REG(0x00212098) /* Endpoint 2 Interrupt Mask	 Register	*/
 #define MX1_USB_EP2_FDAT __REG(0x0021209C) /* Endpoint 2 FIFO Data Register	*/
 #define MX1_USB_EP2_FSTAT __REG(0x002120A0) /* Endpoint 2 FIFO Status Register	*/
-#define MX1_USB_EP2_FCTRL __REG(0x002120A4) /* Endpoint 2 FIFO Control Register	*/
+#define MX1_USB_EP2_FCTRL __REG(0x002120A4) /* Endpoint 2 FIFO Control Register */
 #define MX1_USB_EP2_LRFP __REG(0x002120A8) /* Endpoint 2 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP2_LWFP __REG(0x002120AC) /* Endpoint 2 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP2_FALRM __REG(0x002120B0) /* Endpoint 2 FIFO Alarm  Register	*/
 #define MX1_USB_EP2_FRDP __REG(0x002120B4) /* Endpoint 2 FIFO Read Pointer Register	*/
 #define MX1_USB_EP2_FWRP __REG(0x002120B8) /* Endpoint 2 FIFO Write Pointer Register	*/
 
-
 /* Endpoint 3  */
 #define MX1_USB_EP3_STAT __REG(0x002120C0) /* Endpoint 3 Status/Control Register	*/
 #define MX1_USB_EP3_INTR __REG(0x002120C4) /* Endpoint 3 Interrupt Status  Register	*/
-#define MX1_USB_EP3_MASK __REG(0x002120C8) /* Endpoint 3 Interrupt Mask  Register	*/
+#define MX1_USB_EP3_MASK __REG(0x002120C8) /* Endpoint 3 Interrupt Mask	 Register	*/
 #define MX1_USB_EP3_FDAT __REG(0x002120CC) /* Endpoint 3 FIFO Data Register	*/
 #define MX1_USB_EP3_FSTAT __REG(0x002120D0) /* Endpoint 3 FIFO Status Register	*/
-#define MX1_USB_EP3_FCTRL __REG(0x002120D4) /* Endpoint 3 FIFO Control Register	*/
+#define MX1_USB_EP3_FCTRL __REG(0x002120D4) /* Endpoint 3 FIFO Control Register */
 #define MX1_USB_EP3_LRFP __REG(0x002120D8) /* Endpoint 3 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP3_LWFP __REG(0x002120DC) /* Endpoint 3 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP3_FALRM __REG(0x002120E0) /* Endpoint 3 FIFO Alarm  Register	*/
 #define MX1_USB_EP3_FRDP __REG(0x002120E4) /* Endpoint 3 FIFO Read Pointer Register	*/
 #define MX1_USB_EP3_FWRP __REG(0x002120E8) /* Endpoint 3 FIFO Write Pointer Register	*/
 
-
-
 /* Endpoint 4  */
 #define MX1_USB_EP4_STAT __REG(0x002120F0) /* Endpoint 4 Status/Control Register	*/
 #define MX1_USB_EP4_INTR __REG(0x002120F4) /* Endpoint 4 Interrupt Status  Register	*/
-#define MX1_USB_EP4_MASK __REG(0x002120F8) /* Endpoint 4 Interrupt Mask  Register	*/
+#define MX1_USB_EP4_MASK __REG(0x002120F8) /* Endpoint 4 Interrupt Mask	 Register	*/
 #define MX1_USB_EP4_FDAT __REG(0x002120FC) /* Endpoint 4 FIFO Data Register	*/
 #define MX1_USB_EP4_FSTAT __REG(0x00212100) /* Endpoint 4 FIFO Status Register	*/
-#define MX1_USB_EP4_FCTRL __REG(0x00212104) /* Endpoint 4 FIFO Control Register	*/
+#define MX1_USB_EP4_FCTRL __REG(0x00212104) /* Endpoint 4 FIFO Control Register */
 #define MX1_USB_EP4_LRFP __REG(0x00212108) /* Endpoint 4 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP4_LWFP __REG(0x0021210C) /* Endpoint 4 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP4_FALRM __REG(0x00212110) /* Endpoint 4 FIFO Alarm  Register	*/
 #define MX1_USB_EP4_FRDP __REG(0x00212114) /* Endpoint 4 FIFO Read Pointer Register	*/
 #define MX1_USB_EP4_FWRP __REG(0x00212118) /* Endpoint 4 FIFO Write Pointer Register	*/
 
-
-
 /* Endpoint 5  */
 #define MX1_USB_EP5_STAT __REG(0x00212120) /* Endpoint 5 Status/Control Register	*/
 #define MX1_USB_EP5_INTR __REG(0x00212124) /* Endpoint 5 Interrupt Status  Register	*/
-#define MX1_USB_EP5_MASK __REG(0x00212128) /* Endpoint 5 Interrupt Mask  Register	*/
+#define MX1_USB_EP5_MASK __REG(0x00212128) /* Endpoint 5 Interrupt Mask	 Register	*/
 #define MX1_USB_EP5_FDAT __REG(0x0021212C) /* Endpoint 5 FIFO Data Register	*/
 #define MX1_USB_EP5_FSTAT __REG(0x00212130) /* Endpoint 5 FIFO Status Register	*/
-#define MX1_USB_EP5_FCTRL __REG(0x00212134) /* Endpoint 5 FIFO Control Register	*/
+#define MX1_USB_EP5_FCTRL __REG(0x00212134) /* Endpoint 5 FIFO Control Register */
 #define MX1_USB_EP5_LRFP __REG(0x00212138) /* Endpoint 5 Last Read Frame Pointer Register	*/
 #define MX1_USB_EP5_LWFP __REG(0x0021213C) /* Endpoint 5 Last Write Frame Pointer Register	*/
 #define MX1_USB_EP5_FALRM __REG(0x00212140) /* Endpoint 5 FIFO Alarm  Register	*/
 #define MX1_USB_EP5_FRDP __REG(0x00212144) /* Endpoint 5 FIFO Read Pointer Register	*/
 #define MX1_USB_EP5_FWRP __REG(0x00212148) /* Endpoint 5 FIFO Write Pointer Register	*/
 
-
-
-
 /*
  *	MX1 SPI 1 registers
  */
-
-#define MX1_RXDATAREG1	__REG(0x00213000)  /* SPI 1 Rx Data Register 		*/
-#define MX1_TXDATAREG1	__REG(0x00213004)  /* SPI 1 Tx Data Register 		*/
-#define MX1_CONTROLREG1	__REG(0x00213008)  /* SPI 1 Control Register 		*/
-#define MX1_INTREG1	__REG(0x0021300C)  /* SPI 1 Interrupt Control/Status Register 	*/
-#define MX1_TESTREG1	__REG(0x00213010)  /* SPI 1 Test Register 		*/
-#define MX1_PERIODREG1	__REG(0x00213014)  /* SPI 1 Sample Period Control Register 	*/
-#define MX1_DMAREG1	__REG(0x00213018)  /* SPI 1 DMA Control  Register 	*/
-#define MX1_RESETREG1	__REG(0x00213018)  /* SPI 1 Soft Reset Register 	*/
-
-
-
+#define MX1_RXDATAREG1	__REG(0x00213000)  /* SPI 1 Rx Data Register		*/
+#define MX1_TXDATAREG1	__REG(0x00213004)  /* SPI 1 Tx Data Register		*/
+#define MX1_CONTROLREG1 __REG(0x00213008)  /* SPI 1 Control Register		*/
+#define MX1_INTREG1	__REG(0x0021300C)  /* SPI 1 Interrupt Control/Status Register	*/
+#define MX1_TESTREG1	__REG(0x00213010)  /* SPI 1 Test Register		*/
+#define MX1_PERIODREG1	__REG(0x00213014)  /* SPI 1 Sample Period Control Register	*/
+#define MX1_DMAREG1	__REG(0x00213018)  /* SPI 1 DMA Control	 Register	*/
+#define MX1_RESETREG1	__REG(0x00213018)  /* SPI 1 Soft Reset Register		*/
 
 /*
  *	MX1 MMC/SDHC registers
  */
-
-#define MX1_STR_STP_CLK	__REG(0x00214000)  /* MMC/SD Clock Control Register	*/
-#define MX1_STATUS 	__REG(0x00214004)  /* MMC/SD Status Register		*/
-#define MX1_CLK_RATE 	__REG(0x00214008)  /* MMC/SD Clock Rate Register	*/
+#define MX1_STR_STP_CLK __REG(0x00214000)  /* MMC/SD Clock Control Register	*/
+#define MX1_STATUS	__REG(0x00214004)  /* MMC/SD Status Register		*/
+#define MX1_CLK_RATE	__REG(0x00214008)  /* MMC/SD Clock Rate Register	*/
 #define MX1_CMD_DAT_CONT __REG(0x0021400C)  /* MMC/SD Command & Data Control Register	*/
-#define MX1_RES_TO	__REG(0x00214010)  /* MMC/SD Response Time Out Register	*/
+#define MX1_RES_TO	__REG(0x00214010)  /* MMC/SD Response Time Out Register */
 #define MX1_READ_TO	__REG(0x00214014)  /* MMC/SD Read Time Out Register	*/
 #define MX1_BLK_LEN	__REG(0x00214018)  /* MMC/SD Block Length Register	*/
 #define MX1_NOB		__REG(0x0021401C)  /* MMC/SD Number of Block Register	*/
 #define MX1_REV_NO	__REG(0x00214020)  /* MMC/SD Revision Number Register	*/
 #define MX1_MMC_INT_MASK	__REG(0x00214024)  /* MMC/SD Interrupt Mask Register	*/
-#define MX1_CMD 	__REG(0x00214028)  /* MMC/SD Command Number Register	*/
-#define MX1_ARGH 	__REG(0x0021402C)  /* MMC/SD Higher Argument Register	*/
-#define MX1_ARGL 	__REG(0x00214030)  /* MMC/SD Lower Argument Register	*/
-#define MX1_RES_FIFO 	__REG(0x00214034)  /* MMC/SD Response FIFO Register	*/
+#define MX1_CMD		__REG(0x00214028)  /* MMC/SD Command Number Register	*/
+#define MX1_ARGH	__REG(0x0021402C)  /* MMC/SD Higher Argument Register	*/
+#define MX1_ARGL	__REG(0x00214030)  /* MMC/SD Lower Argument Register	*/
+#define MX1_RES_FIFO	__REG(0x00214034)  /* MMC/SD Response FIFO Register	*/
 #define MX1_BUFFER_ACCESS __REG(0x00214038)  /* MMC/SD Buffer Access Register	*/
 
-
-
 /*
  *	MX1 ASP registers
  */
-
-#define MX1_ASP_PADFIFO	__REG(0x00215000)  /* Pen Sample FIFO 			*/
-#define MX1_ASP_VADFIFO	__REG(0x00215004)  /* Voice ADC Register 		*/
-#define MX1_ASP_VDAFIFO	__REG(0x00215008)  /* Voice DAC Register 		*/
-#define MX1_ASP_VADCOEF	__REG(0x0021500C)  /* Voice ADC FIR Coefficients RAM 	*/
-#define MX1_ASP_ACNTLCR	__REG(0x00215010)  /* Control Register 		 	*/
-#define MX1_ASP_PSMPLRG	__REG(0x00215014)  /* Pen A/D Sample Rate Control Register 	*/
-#define MX1_ASP_ICNTLR	__REG(0x00215018)  /* Interrupt Control Register 	*/
-#define MX1_ASP_ISTATR	__REG(0x0021501C)  /* Interrupt/Error Status Register 	*/
-#define MX1_ASP_VADGAIN	__REG(0x00215020)  /* Voice ADC Control Register  	*/
-#define MX1_ASP_VDAGAIN	__REG(0x00215024)  /* Voice DAC Control Register  	*/
-#define MX1_ASP_VDACOEF	__REG(0x00215028)  /* Voice DAC FIR Coefficients RAM   	*/
-#define MX1_ASP_CLKDIV	__REG(0x0021502C)  /* Clock Divide Register 	   	*/
-#define MX1_ASP_CMPCNTL	__REG(0x0021502C)  /* Compare Control Register 	   	*/
-
-
+#define MX1_ASP_PADFIFO __REG(0x00215000)  /* Pen Sample FIFO			*/
+#define MX1_ASP_VADFIFO __REG(0x00215004)  /* Voice ADC Register		*/
+#define MX1_ASP_VDAFIFO __REG(0x00215008)  /* Voice DAC Register		*/
+#define MX1_ASP_VADCOEF __REG(0x0021500C)  /* Voice ADC FIR Coefficients RAM	*/
+#define MX1_ASP_ACNTLCR __REG(0x00215010)  /* Control Register			*/
+#define MX1_ASP_PSMPLRG __REG(0x00215014)  /* Pen A/D Sample Rate Control Register	*/
+#define MX1_ASP_ICNTLR	__REG(0x00215018)  /* Interrupt Control Register	*/
+#define MX1_ASP_ISTATR	__REG(0x0021501C)  /* Interrupt/Error Status Register	*/
+#define MX1_ASP_VADGAIN __REG(0x00215020)  /* Voice ADC Control Register	*/
+#define MX1_ASP_VDAGAIN __REG(0x00215024)  /* Voice DAC Control Register	*/
+#define MX1_ASP_VDACOEF __REG(0x00215028)  /* Voice DAC FIR Coefficients RAM	*/
+#define MX1_ASP_CLKDIV	__REG(0x0021502C)  /* Clock Divide Register		*/
+#define MX1_ASP_CMPCNTL __REG(0x0021502C)  /* Compare Control Register		*/
 
 /*
  *	MX1 BTA registers
  */
 
-
 /*
  *	MX1 I2C registers
  */
-
-#define MX1_IADR	__REG(0x00217000)  /* I2C Address Register 		*/
-#define MX1_IFDR	__REG(0x00217004)  /* I2C Frequency Divider Register 	*/
-#define MX1_I2CR	__REG(0x00217008)  /* I2C Control Register   		*/
-#define MX1_I2CSR	__REG(0x0021700C)  /* I2C Status Register   		*/
-#define MX1_I2DR	__REG(0x00217010)  /* I2C Data I/O Register  		*/
-
-
+#define MX1_IADR	__REG(0x00217000)  /* I2C Address Register		*/
+#define MX1_IFDR	__REG(0x00217004)  /* I2C Frequency Divider Register	*/
+#define MX1_I2CR	__REG(0x00217008)  /* I2C Control Register		*/
+#define MX1_I2CSR	__REG(0x0021700C)  /* I2C Status Register		*/
+#define MX1_I2DR	__REG(0x00217010)  /* I2C Data I/O Register		*/
 
 /*
  *	MX1 SSI registers
  */
-
-#define MX1_STX		__REG(0x00218000)  /* SSI Transmit Data Register 	*/
-#define MX1_SRX		__REG(0x00218004)  /* SSI Receive Data Register 	*/
-#define MX1_SCSR	__REG(0x00218008)  /* SSI Control/Status Register 	*/
-#define MX1_STCR	__REG(0x0021800C)  /* SSI Transmit Configuration Register 	*/
-#define MX1_SRCR	__REG(0x00218010)  /* SSI Recieve Configuration Register 	*/
-#define MX1_STCCR	__REG(0x00218014)  /* SSI Transmit Clock Control Register 	*/
-#define MX1_SRCCR	__REG(0x00218018)  /* SSI Receive Clock Control Register 	*/
-#define MX1_STSR	__REG(0x0021801C)  /* SSI Time Slot Register 		*/
-#define MX1_SFCSR	__REG(0x00218020)  /* SSI FIFO Control/Status Register 	*/
-#define MX1_SOR		__REG(0x00218024)  /* SSI Option Register 		*/
-
-
+#define MX1_STX		__REG(0x00218000)  /* SSI Transmit Data Register	*/
+#define MX1_SRX		__REG(0x00218004)  /* SSI Receive Data Register		*/
+#define MX1_SCSR	__REG(0x00218008)  /* SSI Control/Status Register	*/
+#define MX1_STCR	__REG(0x0021800C)  /* SSI Transmit Configuration Register	*/
+#define MX1_SRCR	__REG(0x00218010)  /* SSI Recieve Configuration Register	*/
+#define MX1_STCCR	__REG(0x00218014)  /* SSI Transmit Clock Control Register	*/
+#define MX1_SRCCR	__REG(0x00218018)  /* SSI Receive Clock Control Register	*/
+#define MX1_STSR	__REG(0x0021801C)  /* SSI Time Slot Register		*/
+#define MX1_SFCSR	__REG(0x00218020)  /* SSI FIFO Control/Status Register	*/
+#define MX1_SOR		__REG(0x00218024)  /* SSI Option Register		*/
 
 /*
  *	MX1 SPI 2 registers
  */
-
-#define MX1_RXDATAREG2	__REG(0x00219000)  /* SPI 2 Rx Data Register 		*/
-#define MX1_TXDATAREG2	__REG(0x00219004)  /* SPI 2 Tx Data Register 		*/
-#define MX1_CONTROLREG2	__REG(0x00219008)  /* SPI 2 Control Register 		*/
-#define MX1_INTREG2	__REG(0x0021900C)  /* SPI 2 Interrupt Control/Status Register 	*/
-#define MX1_TESTREG2	__REG(0x00219010)  /* SPI 2 Test Register 		*/
-#define MX1_PERIODREG2	__REG(0x00219014)  /* SPI 2 Sample Period Control Register 	*/
-#define MX1_DMAREG2	__REG(0x00219018)  /* SPI 2 DMA Control  Register 	*/
-#define MX1_RESETREG2	__REG(0x00219018)  /* SPI 2 Soft Reset Register 	*/
-
-
+#define MX1_RXDATAREG2	__REG(0x00219000)  /* SPI 2 Rx Data Register		*/
+#define MX1_TXDATAREG2	__REG(0x00219004)  /* SPI 2 Tx Data Register		*/
+#define MX1_CONTROLREG2 __REG(0x00219008)  /* SPI 2 Control Register		*/
+#define MX1_INTREG2	__REG(0x0021900C)  /* SPI 2 Interrupt Control/Status Register	*/
+#define MX1_TESTREG2	__REG(0x00219010)  /* SPI 2 Test Register		*/
+#define MX1_PERIODREG2	__REG(0x00219014)  /* SPI 2 Sample Period Control Register	*/
+#define MX1_DMAREG2	__REG(0x00219018)  /* SPI 2 DMA Control	 Register	*/
+#define MX1_RESETREG2	__REG(0x00219018)  /* SPI 2 Soft Reset Register		*/
 
 /*
  *	MX1 MSHC registers
  */
-
-#define MX1_MSCMD	__REG(0x0021A000)  /* Memory Stick Command Register 	*/
-#define MX1_MSCS	__REG(0x0021A002)  /* Memory Stick Control/Status Register 	*/
-#define MX1_MSTDATA	__REG(0x0021A004)  /* Memory Stick Transmit FIFO Data Register 	*/
-#define MX1_MSRDATA	__REG(0x0021A004)  /* Memory Stick Recieve FIFO Data Register 	*/
-#define MX1_MSICS	__REG(0x0021A006)  /* Memory Stick Interrupt Control/Status Register 	*/
-#define MX1_MSPPCD	__REG(0x0021A008)  /* Memory Stick Parallel Port Control/Data Register 	*/
-#define MX1_MSC2	__REG(0x0021A00A)  /* Memory Stick Control 2 Register 	*/
-#define MX1_MSACD	__REG(0x0021A00C)  /* Memory Stick Auto Command Register 	*/
-#define MX1_MSFAECS 	__REG(0x0021A00E)  /* Memory Stick FIFO Access Error Control/Status Register 	*/
-#define MX1_MSCLKD 	__REG(0x0021A010)  /* Memory Stick Serial Clock divider Register 	*/
-#define MX1_MSDRQC 	__REG(0x0021A012)  /* Memory Stick DMA Request Control Register */
-
-
+#define MX1_MSCMD	__REG(0x0021A000)  /* Memory Stick Command Register	*/
+#define MX1_MSCS	__REG(0x0021A002)  /* Memory Stick Control/Status Register	*/
+#define MX1_MSTDATA	__REG(0x0021A004)  /* Memory Stick Transmit FIFO Data Register	*/
+#define MX1_MSRDATA	__REG(0x0021A004)  /* Memory Stick Recieve FIFO Data Register	*/
+#define MX1_MSICS	__REG(0x0021A006)  /* Memory Stick Interrupt Control/Status Register	*/
+#define MX1_MSPPCD	__REG(0x0021A008)  /* Memory Stick Parallel Port Control/Data Register	*/
+#define MX1_MSC2	__REG(0x0021A00A)  /* Memory Stick Control 2 Register	*/
+#define MX1_MSACD	__REG(0x0021A00C)  /* Memory Stick Auto Command Register	*/
+#define MX1_MSFAECS	__REG(0x0021A00E)  /* Memory Stick FIFO Access Error Control/Status Register	*/
+#define MX1_MSCLKD	__REG(0x0021A010)  /* Memory Stick Serial Clock divider Register	*/
+#define MX1_MSDRQC	__REG(0x0021A012)  /* Memory Stick DMA Request Control Register */
 
 /*
  *	MX1 PLLCLK registers
  */
-
-#define MX1_CSCR	__REG(0x0021B000)  /* Clock Source Control Register 	*/
-#define MX1_MPCTL0	__REG(0x0021B004)  /* MCU PLL Control Register 0 	*/
+#define MX1_CSCR	__REG(0x0021B000)  /* Clock Source Control Register	*/
+#define MX1_MPCTL0	__REG(0x0021B004)  /* MCU PLL Control Register 0	*/
 #define MX1_MPCTL1	__REG(0x0021B008)  /* MCU PLL & System Clock Control Register 1 */
 #define MX1_UPCTL0	__REG(0x0021B00C)  /* USB PLL Control Register 0	*/
 #define MX1_UPCTL1	__REG(0x0021B010)  /* USB PLL Control Register 1	*/
-#define MX1_PCDR	__REG(0x0021B020)  /* Peripheral Clock Divider Register	*/
-
+#define MX1_PCDR	__REG(0x0021B020)  /* Peripheral Clock Divider Register */
 
 /*
  *	MX1 RESET registers
  */
-
-#define MX1_RSR		__REG(0x0021B800)  /* Reset Source Register 		*/
-
-
+#define MX1_RSR		__REG(0x0021B800)  /* Reset Source Register		*/
 
 /*
  *	MX1 SYS CTRL registers
  */
-
-#define MX1_SIDR	__REG(0x0021B804)  /* Silicon ID Register 		*/
-#define MX1_FMCR	__REG(0x0021B808)  /* Function MultiPlexing Control Register 	*/
-#define MX1_GPCR	__REG(0x0021B80C)  /* Global Peripheral Control Register 	*/
-
+#define MX1_SIDR	__REG(0x0021B804)  /* Silicon ID Register		*/
+#define MX1_FMCR	__REG(0x0021B808)  /* Function MultiPlexing Control Register	*/
+#define MX1_GPCR	__REG(0x0021B80C)  /* Global Peripheral Control Register	*/
 
 /*
  *	MX1 GPIO registers
  */
 
 /* Port A */
-#define MX1_DDIR_A	__REG(0x0021C000)  /* Port A Data Direction Register 	*/
+#define MX1_DDIR_A	__REG(0x0021C000)  /* Port A Data Direction Register	*/
 #define MX1_OCR1_A	__REG(0x0021C004)  /* Port A Output Configuration Register 1	*/
 #define MX1_OCR2_A	__REG(0x0021C008)  /* Port A Output Configuration Register 2	*/
 #define MX1_ICONFA1_A	__REG(0x0021C00C)  /* Port A Input Configuration Register A1	*/
 #define MX1_ICONFA2_A	__REG(0x0021C010)  /* Port A Input Configuration Register A2	*/
 #define MX1_ICONFB1_A	__REG(0x0021C014)  /* Port A Input Configuration Register B1	*/
 #define MX1_ICONFB2_A	__REG(0x0021C018)  /* Port A Input Configuration Register B2	*/
-#define MX1_DR_A	__REG(0x0021C01C)  /* Port A Data Register 		*/
-#define MX1_GIUS_A	__REG(0x0021C020)  /* Port A GPIO In Use Register 	*/
-#define MX1_SSR_A	__REG(0x0021C024)  /* Port A Sample Status Register 	*/
-#define MX1_ICR1_A	__REG(0x0021C028)  /* Port A Interrupt Configuration Register 1	*/
-#define MX1_ICR2_A	__REG(0x0021C02C)  /* Port A Interrupt Configuration Register 2	*/
+#define MX1_DR_A	__REG(0x0021C01C)  /* Port A Data Register		*/
+#define MX1_GIUS_A	__REG(0x0021C020)  /* Port A GPIO In Use Register	*/
+#define MX1_SSR_A	__REG(0x0021C024)  /* Port A Sample Status Register	*/
+#define MX1_ICR1_A	__REG(0x0021C028)  /* Port A Interrupt Configuration Register 1 */
+#define MX1_ICR2_A	__REG(0x0021C02C)  /* Port A Interrupt Configuration Register 2 */
 #define MX1_IMR_A	__REG(0x0021C030)  /* Port A Interrupt Mask Register	*/
 #define MX1_ISR_A	__REG(0x0021C034)  /* Port A Interrupt Status Register	*/
 #define MX1_GPR_A	__REG(0x0021C038)  /* Port A General Purpose Register	*/
 #define MX1_SWR_A	__REG(0x0021C03C)  /* Port A Software Reset Register	*/
 #define MX1_PUEN_A	__REG(0x0021C040)  /* Port A Pull Up Enable Register	*/
 
-
 /* Port B */
-#define MX1_DDIR_B	__REG(0x0021C100)  /* Port B Data Direction Register 	*/
+#define MX1_DDIR_B	__REG(0x0021C100)  /* Port B Data Direction Register	*/
 #define MX1_OCR1_B	__REG(0x0021C104)  /* Port B Output Configuration Register 1	*/
 #define MX1_OCR2_B	__REG(0x0021C108)  /* Port B Output Configuration Register 2	*/
 #define MX1_ICONFA1_B	__REG(0x0021C10C)  /* Port B Input Configuration Register A1	*/
 #define MX1_ICONFA2_B	__REG(0x0021C110)  /* Port B Input Configuration Register A2	*/
 #define MX1_ICONFB1_B	__REG(0x0021C114)  /* Port B Input Configuration Register B1	*/
 #define MX1_ICONFB2_B	__REG(0x0021C118)  /* Port B Input Configuration Register B2	*/
-#define MX1_DR_B	__REG(0x0021C11C)  /* Port B Data Register 		*/
-#define MX1_GIUS_B	__REG(0x0021C120)  /* Port B GPIO In Use Register 	*/
-#define MX1_SSR_B	__REG(0x0021C124)  /* Port B Sample Status Register 	*/
-#define MX1_ICR1_B	__REG(0x0021C128)  /* Port B Interrupt Configuration Register 1	*/
-#define MX1_ICR2_B	__REG(0x0021C12C)  /* Port B Interrupt Configuration Register 2	*/
+#define MX1_DR_B	__REG(0x0021C11C)  /* Port B Data Register		*/
+#define MX1_GIUS_B	__REG(0x0021C120)  /* Port B GPIO In Use Register	*/
+#define MX1_SSR_B	__REG(0x0021C124)  /* Port B Sample Status Register	*/
+#define MX1_ICR1_B	__REG(0x0021C128)  /* Port B Interrupt Configuration Register 1 */
+#define MX1_ICR2_B	__REG(0x0021C12C)  /* Port B Interrupt Configuration Register 2 */
 #define MX1_IMR_B	__REG(0x0021C130)  /* Port B Interrupt Mask Register	*/
 #define MX1_ISR_B	__REG(0x0021C134)  /* Port B Interrupt Status Register	*/
 #define MX1_GPR_B	__REG(0x0021C138)  /* Port B General Purpose Register	*/
 #define MX1_SWR_B	__REG(0x0021C13C)  /* Port B Software Reset Register	*/
 #define MX1_PUEN_B	__REG(0x0021C140)  /* Port B Pull Up Enable Register	*/
 
-
-
 /* Port C */
-#define MX1_DDIR_C	__REG(0x0021C200)  /* Port C Data Direction Register 	*/
+#define MX1_DDIR_C	__REG(0x0021C200)  /* Port C Data Direction Register	*/
 #define MX1_OCR1_C	__REG(0x0021C204)  /* Port C Output Configuration Register 1	*/
 #define MX1_OCR2_C	__REG(0x0021C208)  /* Port C Output Configuration Register 2	*/
 #define MX1_ICONFA1_C	__REG(0x0021C20C)  /* Port C Input Configuration Register A1	*/
 #define MX1_ICONFA2_C	__REG(0x0021C210)  /* Port C Input Configuration Register A2	*/
 #define MX1_ICONFB1_C	__REG(0x0021C214)  /* Port C Input Configuration Register B1	*/
 #define MX1_ICONFB2_C	__REG(0x0021C218)  /* Port C Input Configuration Register B2	*/
-#define MX1_DR_C	__REG(0x0021C21C)  /* Port C Data Register 		*/
-#define MX1_GIUS_C	__REG(0x0021C220)  /* Port C GPIO In Use Register 	*/
-#define MX1_SSR_C	__REG(0x0021C224)  /* Port C Sample Status Register 	*/
-#define MX1_ICR1_C	__REG(0x0021C228)  /* Port C Interrupt Configuration Register 1	*/
-#define MX1_ICR2_C	__REG(0x0021C22C)  /* Port C Interrupt Configuration Register 2	*/
+#define MX1_DR_C	__REG(0x0021C21C)  /* Port C Data Register		*/
+#define MX1_GIUS_C	__REG(0x0021C220)  /* Port C GPIO In Use Register	*/
+#define MX1_SSR_C	__REG(0x0021C224)  /* Port C Sample Status Register	*/
+#define MX1_ICR1_C	__REG(0x0021C228)  /* Port C Interrupt Configuration Register 1 */
+#define MX1_ICR2_C	__REG(0x0021C22C)  /* Port C Interrupt Configuration Register 2 */
 #define MX1_IMR_C	__REG(0x0021C230)  /* Port C Interrupt Mask Register	*/
 #define MX1_ISR_C	__REG(0x0021C234)  /* Port C Interrupt Status Register	*/
 #define MX1_GPR_C	__REG(0x0021C238)  /* Port C General Purpose Register	*/
 #define MX1_SWR_C	__REG(0x0021C23C)  /* Port C Software Reset Register	*/
 #define MX1_PUEN_C	__REG(0x0021C240)  /* Port C Pull Up Enable Register	*/
 
-
-
 /* Port D */
-#define MX1_DDIR_D	__REG(0x0021C300)  /* Port D Data Direction Register 	*/
+#define MX1_DDIR_D	__REG(0x0021C300)  /* Port D Data Direction Register	*/
 #define MX1_OCR1_D	__REG(0x0021C304)  /* Port D Output Configuration Register 1	*/
 #define MX1_OCR2_D	__REG(0x0021C308)  /* Port D Output Configuration Register 2	*/
 #define MX1_ICONFA1_D	__REG(0x0021C30C)  /* Port D Input Configuration Register A1	*/
 #define MX1_ICONFA2_D	__REG(0x0021C310)  /* Port D Input Configuration Register A2	*/
 #define MX1_ICONFB1_D	__REG(0x0021C314)  /* Port D Input Configuration Register B1	*/
 #define MX1_ICONFB2_D	__REG(0x0021C318)  /* Port D Input Configuration Register B2	*/
-#define MX1_DR_D	__REG(0x0021C31C)  /* Port D Data Register 		*/
-#define MX1_GIUS_D	__REG(0x0021C320)  /* Port D GPIO In Use Register 	*/
-#define MX1_SSR_D	__REG(0x0021C324)  /* Port D Sample Status Register 	*/
-#define MX1_ICR1_D	__REG(0x0021C328)  /* Port D Interrupt Configuration Register 1	*/
-#define MX1_ICR2_D	__REG(0x0021C32C)  /* Port D Interrupt Configuration Register 2	*/
+#define MX1_DR_D	__REG(0x0021C31C)  /* Port D Data Register		*/
+#define MX1_GIUS_D	__REG(0x0021C320)  /* Port D GPIO In Use Register	*/
+#define MX1_SSR_D	__REG(0x0021C324)  /* Port D Sample Status Register	*/
+#define MX1_ICR1_D	__REG(0x0021C328)  /* Port D Interrupt Configuration Register 1 */
+#define MX1_ICR2_D	__REG(0x0021C32C)  /* Port D Interrupt Configuration Register 2 */
 #define MX1_IMR_D	__REG(0x0021C330)  /* Port D Interrupt Mask Register	*/
 #define MX1_ISR_D	__REG(0x0021C334)  /* Port D Interrupt Status Register	*/
 #define MX1_GPR_D	__REG(0x0021C338)  /* Port D General Purpose Register	*/
 #define MX1_SWR_D	__REG(0x0021C33C)  /* Port D Software Reset Register	*/
 #define MX1_PUEN_D	__REG(0x0021C340)  /* Port D Pull Up Enable Register	*/
 
-
-
 /*
  *	MX1 EIM registers
  */
-
-#define MX1_CS0U	__REG(0x00220000)  /* Chip Select 0 Upper Control Register 	*/
-#define MX1_CS0L	__REG(0x00220004)  /* Chip Select 0 Lower Control Register 	*/
-#define MX1_CS1U	__REG(0x00220008)  /* Chip Select 1 Upper Control Register 	*/
-#define MX1_CS1L	__REG(0x0022000C)  /* Chip Select 1 Lower Control Register 	*/
-#define MX1_CS2U	__REG(0x00220010)  /* Chip Select 2 Upper Control Register 	*/
-#define MX1_CS2L	__REG(0x00220014)  /* Chip Select 2 Lower Control Register 	*/
-#define MX1_CS3U	__REG(0x00220018)  /* Chip Select 3 Upper Control Register 	*/
-#define MX1_CS3L	__REG(0x0022001C)  /* Chip Select 3 Lower Control Register 	*/
-#define MX1_CS4U	__REG(0x00220020)  /* Chip Select 4 Upper Control Register 	*/
-#define MX1_CS4L	__REG(0x00220024)  /* Chip Select 4 Lower Control Register 	*/
-#define MX1_CS5U	__REG(0x00220028)  /* Chip Select 5 Upper Control Register 	*/
-#define MX1_CS5L	__REG(0x0022002C)  /* Chip Select 5 Lower Control Register 	*/
-#define MX1_WEIM	__REG(0x00220030)  /* weim cONFIGURATION Register 	*/
-
-
+#define MX1_CS0U	__REG(0x00220000)  /* Chip Select 0 Upper Control Register	*/
+#define MX1_CS0L	__REG(0x00220004)  /* Chip Select 0 Lower Control Register	*/
+#define MX1_CS1U	__REG(0x00220008)  /* Chip Select 1 Upper Control Register	*/
+#define MX1_CS1L	__REG(0x0022000C)  /* Chip Select 1 Lower Control Register	*/
+#define MX1_CS2U	__REG(0x00220010)  /* Chip Select 2 Upper Control Register	*/
+#define MX1_CS2L	__REG(0x00220014)  /* Chip Select 2 Lower Control Register	*/
+#define MX1_CS3U	__REG(0x00220018)  /* Chip Select 3 Upper Control Register	*/
+#define MX1_CS3L	__REG(0x0022001C)  /* Chip Select 3 Lower Control Register	*/
+#define MX1_CS4U	__REG(0x00220020)  /* Chip Select 4 Upper Control Register	*/
+#define MX1_CS4L	__REG(0x00220024)  /* Chip Select 4 Lower Control Register	*/
+#define MX1_CS5U	__REG(0x00220028)  /* Chip Select 5 Upper Control Register	*/
+#define MX1_CS5L	__REG(0x0022002C)  /* Chip Select 5 Lower Control Register	*/
+#define MX1_WEIM	__REG(0x00220030)  /* weim cONFIGURATION Register	*/
 
 /*
  *	MX1 SDRAMC registers
  */
-
-#define MX1_SDCTL0	__REG(0x00221000)  /* SDRAM 0 Control Register 		*/
-#define MX1_SDCTL1	__REG(0x00221004)  /* SDRAM 1 Control Register 		*/
-#define MX1_MISCELLANEOUS __REG(0x00221014)  /* Miscellaneous Register 		*/
-#define MX1_SDRST	__REG(0x00221018)  /* SDRAM Reset Register 		*/
-
-
+#define MX1_SDCTL0	__REG(0x00221000)  /* SDRAM 0 Control Register		*/
+#define MX1_SDCTL1	__REG(0x00221004)  /* SDRAM 1 Control Register		*/
+#define MX1_MISCELLANEOUS __REG(0x00221014)  /* Miscellaneous Register		*/
+#define MX1_SDRST	__REG(0x00221018)  /* SDRAM Reset Register		*/
 
 /*
  *	MX1 MMA registers
  */
-
-#define MX1_MMA_MAC_MOD	__REG(0x00222000)  /* MMA MAC Module Register 		*/
-#define MX1_MMA_MAC_CTRL __REG(0x00222004)  /* MMA MAC Control Register 	*/
-#define MX1_MMA_MAC_MULT __REG(0x00222008)  /* MMA MAC Multiply Counter Register 	*/
-#define MX1_MMA_MAC_ACCU __REG(0x0022200C)  /* MMA MAC Accumulate Counter Register 	*/
-#define MX1_MMA_MAC_INTR __REG(0x00222010)  /* MMA MAC Interrupt Register 	*/
-#define MX1_MMA_MAC_INTR_MASK __REG(0x00222014)  /* MMA MAC Interrupt Mask Register 	*/
-#define MX1_MMA_MAC_FIFO __REG(0x00222018)  /* MMA MAC FIFO Register	 	*/
-#define MX1_MMA_MAC_FIFO_STAT __REG(0x0022201C)  /* MMA MAC FIFO Status Register 	*/
-#define MX1_MMA_MAC_BURST __REG(0x00222020)  /* MMA MAC Burst Count Register 	*/
-#define MX1_MMA_MAC_BITSEL __REG(0x00222024)  /* MMA MAC Bit Select Register 	*/
+#define MX1_MMA_MAC_MOD __REG(0x00222000)  /* MMA MAC Module Register		*/
+#define MX1_MMA_MAC_CTRL __REG(0x00222004)  /* MMA MAC Control Register		*/
+#define MX1_MMA_MAC_MULT __REG(0x00222008)  /* MMA MAC Multiply Counter Register	*/
+#define MX1_MMA_MAC_ACCU __REG(0x0022200C)  /* MMA MAC Accumulate Counter Register	*/
+#define MX1_MMA_MAC_INTR __REG(0x00222010)  /* MMA MAC Interrupt Register	*/
+#define MX1_MMA_MAC_INTR_MASK __REG(0x00222014)	 /* MMA MAC Interrupt Mask Register	*/
+#define MX1_MMA_MAC_FIFO __REG(0x00222018)  /* MMA MAC FIFO Register		*/
+#define MX1_MMA_MAC_FIFO_STAT __REG(0x0022201C)	 /* MMA MAC FIFO Status Register	*/
+#define MX1_MMA_MAC_BURST __REG(0x00222020)  /* MMA MAC Burst Count Register	*/
+#define MX1_MMA_MAC_BITSEL __REG(0x00222024)  /* MMA MAC Bit Select Register	*/
 
 #define MX1_MMA_MAC_XBASE __REG(0x00222200)  /* MMA MAC X Base Address Register */
-#define MX1_MMA_MAC_XINDEX __REG(0x00222204)  /* MMA MAC X Index Register 	*/
-#define MX1_MMA_MAC_XLENGTH __REG(0x00222208)  /* MMA MAC X Length Register 	*/
-#define MX1_MMA_MAC_XMODIFY __REG(0x0022220C)  /* MMA MAC X Modify Register 	*/
-#define MX1_MMA_MAC_XINCR __REG(0x00222210)  /* MMA MAC X Increment Register 	*/
-#define MX1_MMA_MAC_XCOUNT __REG(0x00222214)  /* MMA MAC X Count Register 	*/
-
+#define MX1_MMA_MAC_XINDEX __REG(0x00222204)  /* MMA MAC X Index Register	*/
+#define MX1_MMA_MAC_XLENGTH __REG(0x00222208)  /* MMA MAC X Length Register	*/
+#define MX1_MMA_MAC_XMODIFY __REG(0x0022220C)  /* MMA MAC X Modify Register	*/
+#define MX1_MMA_MAC_XINCR __REG(0x00222210)  /* MMA MAC X Increment Register	*/
+#define MX1_MMA_MAC_XCOUNT __REG(0x00222214)  /* MMA MAC X Count Register	*/
 
 #define MX1_MMA_MAC_YBASE __REG(0x00222300)  /* MMA MAC Y Base Address Register */
-#define MX1_MMA_MAC_YINDEX __REG(0x00222304)  /* MMA MAC Y Index Register 	*/
-#define MX1_MMA_MAC_YLENGTH __REG(0x00222308)  /* MMA MAC Y Length Register 	*/
-#define MX1_MMA_MAC_YMODIFY __REG(0x0022230C)  /* MMA MAC Y Modify Register 	*/
-#define MX1_MMA_MAC_YINCR __REG(0x00222310)  /* MMA MAC Y Increment Register 	*/
-#define MX1_MMA_MAC_YCOUNT __REG(0x00222314)  /* MMA MAC Y Count Register 	*/
-
-
-#define MX1_MMA_DCTCTRL __REG(0x00222400)  /* DCT/iDCT Control Register 	*/
-#define MX1_MMA_DCTVERSION __REG(0x00222404)  /* DCT/iDCT Version Register 	*/
-#define MX1_MMA_DCTIRQENA __REG(0x00222408)  /* DCT/iDCT IRQ Enable Register 	*/
-#define MX1_MMA_DCTIRQSTAT __REG(0x0022240C)  /* DCT/iDCT IRQ Status Register 	*/
-#define MX1_MMA_DCTSRCDATA __REG(0x00222410)  /* DCT/iDCT Source Data Address  	*/
-#define MX1_MMA_DCTDESDATA __REG(0x00222414)  /* DCT/iDCT Destination Data Address  	*/
-#define MX1_MMA_DCTXOFF	__REG(0x00222418)  /* DCT/iDCT X-Offset Address  	*/
-#define MX1_MMA_DCTYOFF	__REG(0x0022241C)  /* DCT/iDCT Y-Offset Address  	*/
-#define MX1_MMA_DCTXYCNT __REG(0x00222420)  /* DCT/iDCT XY Count 	  	*/
-#define MX1_MMA_DCTSKIP __REG(0x00222424)  /* DCT/iDCT Skip Address  	  	*/
-#define MX1_MMA_DCTFIFO __REG(0x00222500)  /* DCT/iDCT Data FIFO  	  	*/
-
-
-
+#define MX1_MMA_MAC_YINDEX __REG(0x00222304)  /* MMA MAC Y Index Register	*/
+#define MX1_MMA_MAC_YLENGTH __REG(0x00222308)  /* MMA MAC Y Length Register	*/
+#define MX1_MMA_MAC_YMODIFY __REG(0x0022230C)  /* MMA MAC Y Modify Register	*/
+#define MX1_MMA_MAC_YINCR __REG(0x00222310)  /* MMA MAC Y Increment Register	*/
+#define MX1_MMA_MAC_YCOUNT __REG(0x00222314)  /* MMA MAC Y Count Register	*/
+
+#define MX1_MMA_DCTCTRL __REG(0x00222400)  /* DCT/iDCT Control Register		*/
+#define MX1_MMA_DCTVERSION __REG(0x00222404)  /* DCT/iDCT Version Register	*/
+#define MX1_MMA_DCTIRQENA __REG(0x00222408)  /* DCT/iDCT IRQ Enable Register	*/
+#define MX1_MMA_DCTIRQSTAT __REG(0x0022240C)  /* DCT/iDCT IRQ Status Register	*/
+#define MX1_MMA_DCTSRCDATA __REG(0x00222410)  /* DCT/iDCT Source Data Address	*/
+#define MX1_MMA_DCTDESDATA __REG(0x00222414)  /* DCT/iDCT Destination Data Address	*/
+#define MX1_MMA_DCTXOFF __REG(0x00222418)  /* DCT/iDCT X-Offset Address		*/
+#define MX1_MMA_DCTYOFF __REG(0x0022241C)  /* DCT/iDCT Y-Offset Address		*/
+#define MX1_MMA_DCTXYCNT __REG(0x00222420)  /* DCT/iDCT XY Count		*/
+#define MX1_MMA_DCTSKIP __REG(0x00222424)  /* DCT/iDCT Skip Address		*/
+#define MX1_MMA_DCTFIFO __REG(0x00222500)  /* DCT/iDCT Data FIFO		*/
 
 /*
  *	MX1 AITC registers
  */
-
-#define MX1_INTCNTL	__REG(0x00223000)  /* Interrupt Control Register 	*/
-#define MX1_NIMASK	__REG(0x00223004)  /* Normal Interrupt Mask Register 	*/
-#define MX1_INTENNUM	__REG(0x00223008)  /* Interrupt Enable Number Register 	*/
-#define MX1_INTDISNUM	__REG(0x0022300C)  /* Interrupt Disable Number Register	*/
-#define MX1_INTENABLEH	__REG(0x00223010)  /* Interrupt Enable Register High 	*/
-#define MX1_INTENABLEL	__REG(0x00223014)  /* Interrupt Enable Register Low 	*/
-#define MX1_INTTYPEH	__REG(0x00223018)  /* Interrupt Type Register High 	*/
-#define MX1_INTTYPEL	__REG(0x0022301C)  /* Interrupt Type Register Low 	*/
-#define MX1_NIPRIORITY7	__REG(0x00223020)  /* Normal Interrupt Priority Level Register 7*/
-#define MX1_NIPRIORITY6	__REG(0x00223024)  /* Normal Interrupt Priority Level Register 6*/
-#define MX1_NIPRIORITY5	__REG(0x00223028)  /* Normal Interrupt Priority Level Register 5*/
-#define MX1_NIPRIORITY4	__REG(0x0022302C)  /* Normal Interrupt Priority Level Register 4*/
-#define MX1_NIPRIORITY3	__REG(0x00223030)  /* Normal Interrupt Priority Level Register 3*/
-#define MX1_NIPRIORITY2	__REG(0x00223034)  /* Normal Interrupt Priority Level Register 2*/
-#define MX1_NIPRIORITY1	__REG(0x00223038)  /* Normal Interrupt Priority Level Register 1*/
-#define MX1_NIPRIORITY0	__REG(0x0022303C)  /* Normal Interrupt Priority Level Register 0*/
+#define MX1_INTCNTL	__REG(0x00223000)  /* Interrupt Control Register	*/
+#define MX1_NIMASK	__REG(0x00223004)  /* Normal Interrupt Mask Register	*/
+#define MX1_INTENNUM	__REG(0x00223008)  /* Interrupt Enable Number Register	*/
+#define MX1_INTDISNUM	__REG(0x0022300C)  /* Interrupt Disable Number Register */
+#define MX1_INTENABLEH	__REG(0x00223010)  /* Interrupt Enable Register High	*/
+#define MX1_INTENABLEL	__REG(0x00223014)  /* Interrupt Enable Register Low	*/
+#define MX1_INTTYPEH	__REG(0x00223018)  /* Interrupt Type Register High	*/
+#define MX1_INTTYPEL	__REG(0x0022301C)  /* Interrupt Type Register Low	*/
+#define MX1_NIPRIORITY7 __REG(0x00223020)  /* Normal Interrupt Priority Level Register 7*/
+#define MX1_NIPRIORITY6 __REG(0x00223024)  /* Normal Interrupt Priority Level Register 6*/
+#define MX1_NIPRIORITY5 __REG(0x00223028)  /* Normal Interrupt Priority Level Register 5*/
+#define MX1_NIPRIORITY4 __REG(0x0022302C)  /* Normal Interrupt Priority Level Register 4*/
+#define MX1_NIPRIORITY3 __REG(0x00223030)  /* Normal Interrupt Priority Level Register 3*/
+#define MX1_NIPRIORITY2 __REG(0x00223034)  /* Normal Interrupt Priority Level Register 2*/
+#define MX1_NIPRIORITY1 __REG(0x00223038)  /* Normal Interrupt Priority Level Register 1*/
+#define MX1_NIPRIORITY0 __REG(0x0022303C)  /* Normal Interrupt Priority Level Register 0*/
 #define MX1_NIVECSR	__REG(0x00223040)  /* Normal Interrupt Vector & Status Register */
 #define MX1_FIVECSR	__REG(0x00223044)  /* Fast Interrupt Vector & Status Register	*/
-#define MX1_INTSRCH	__REG(0x00223048)  /* Interrupt Source Register High 	*/
-#define MX1_INTSRCL	__REG(0x0022304C)  /* Interrupt Source Register Low 	*/
-#define MX1_INTFRCH	__REG(0x00223050)  /* Interrupt Force Register High 	*/
-#define MX1_INTFRCL	__REG(0x00223054)  /* Interrupt Force Register Low 	*/
-#define MX1_NIPNDH	__REG(0x00223058)  /* Normal Interrupt Pending Register High 	*/
-#define MX1_NIPNDL	__REG(0x0022305C)  /* Normal Interrupt Pending Register Low 	*/
-#define MX1_FIPNDH	__REG(0x00223060)  /* Fast Interrupt Pending Register High 	*/
-#define MX1_FIPNDL	__REG(0x00223064)  /* Fast Interrupt Pending Register Low 	*/
-
+#define MX1_INTSRCH	__REG(0x00223048)  /* Interrupt Source Register High	*/
+#define MX1_INTSRCL	__REG(0x0022304C)  /* Interrupt Source Register Low	*/
+#define MX1_INTFRCH	__REG(0x00223050)  /* Interrupt Force Register High	*/
+#define MX1_INTFRCL	__REG(0x00223054)  /* Interrupt Force Register Low	*/
+#define MX1_NIPNDH	__REG(0x00223058)  /* Normal Interrupt Pending Register High	*/
+#define MX1_NIPNDL	__REG(0x0022305C)  /* Normal Interrupt Pending Register Low	*/
+#define MX1_FIPNDH	__REG(0x00223060)  /* Fast Interrupt Pending Register High	*/
+#define MX1_FIPNDL	__REG(0x00223064)  /* Fast Interrupt Pending Register Low	*/
 
 /*
  *	MX1 CSI registers
  */
-
-#define MX1_CSICR1	__REG(0x00224000)  /* CSI Control Register 1	 	*/
-#define MX1_CSICR2	__REG(0x00224004)  /* CSI Control Register 2	 	*/
-#define MX1_CSISR	__REG(0x00224008)  /* CSI Status Register 1	 	*/
+#define MX1_CSICR1	__REG(0x00224000)  /* CSI Control Register 1		*/
+#define MX1_CSICR2	__REG(0x00224004)  /* CSI Control Register 2		*/
+#define MX1_CSISR	__REG(0x00224008)  /* CSI Status Register 1		*/
 #define MX1_CSISTATR	__REG(0x0022400C)  /* CSI Statistic FIFO Register 1	*/
 #define MX1_CSIRXR	__REG(0x00224010)  /* CSI RxFIFO Register 1		*/
 
-
-
 #endif	/*  __MC9328_H__ */
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #if 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /*
-	MX1 dma definition 
+	MX1 dma definition
 */
 
 #define MAX_DMA_ADDRESS		0xffffffff
 
-//#define MAX_DMA_CHANNELS	0
+/*#define MAX_DMA_CHANNELS	0 */
 
-#define MAX_DMA_CHANNELS 		11
+#define MAX_DMA_CHANNELS		11
 #define MAX_DMA_2D_REGSET		2
 
 /* MX1 DMA module registers' address */
 
-#define	MX1_DMA_BASE		IO_ADDRESS(0x00209000)
-#define	MX1_DMA_DCR		(MX1_DMA_BASE + 0x00)		// DMA control register
-#define	MX1_DMA_DISR		(MX1_DMA_BASE + 0x04)		// DMA interrupt status register
-#define	MX1_DMA_DIMR		(MX1_DMA_BASE + 0x08)		// DMA interrupt mask register
-#define	MX1_DMA_DBTOSR		(MX1_DMA_BASE + 0x0C)		// DMA burst time-out status register
-#define	MX1_DMA_DRTOSR		(MX1_DMA_BASE + 0x10)		// DMA request time-out status register
-#define	MX1_DMA_DSESR		(MX1_DMA_BASE + 0x14)		// DMA transfer error status register
-#define	MX1_DMA_DBOSR		(MX1_DMA_BASE + 0x18)		// DMA buffer overflow status register
-#define	MX1_DMA_DBTOCR		(MX1_DMA_BASE + 0x1C)		// DMA burst time-out control register
-#define	MX1_DMA_WSRA		(MX1_DMA_BASE + 0x40)		// W-size register A
-#define	MX1_DMA_XSRA		(MX1_DMA_BASE + 0x44)		// X-size register A
-#define	MX1_DMA_YSRA		(MX1_DMA_BASE + 0x48)		// Y-size register A
-#define	MX1_DMA_WSRB		(MX1_DMA_BASE + 0x4C)		// W-size register B
-#define	MX1_DMA_XSRB		(MX1_DMA_BASE + 0x50)		// X-size register B
-#define	MX1_DMA_YSRB		(MX1_DMA_BASE + 0x54)		// Y-size register B
-
-#define	MX1_DMA_SAR0		(MX1_DMA_BASE + 0x80)		// source address register 0
-#define	MX1_DMA_DAR0		(MX1_DMA_BASE + 0x84)		// destination address register 0
-#define	MX1_DMA_CNTR0		(MX1_DMA_BASE + 0x88)		// count register 0
-#define	MX1_DMA_CCR0		(MX1_DMA_BASE + 0x8C)		// channel control register 0
-#define	MX1_DMA_RSSR0		(MX1_DMA_BASE + 0x90)		// request source select register 0
-#define	MX1_DMA_BLR0		(MX1_DMA_BASE + 0x94)		// burst length register 0
-#define	MX1_DMA_RTOR0		(MX1_DMA_BASE + 0x98)		// request time-out register 0
-#define	MX1_DMA_BUCR0		(MX1_DMA_BASE + 0x98)		// bus utilization control register 0
+#define MX1_DMA_BASE		IO_ADDRESS(0x00209000)
+#define MX1_DMA_DCR		(MX1_DMA_BASE + 0x00)		/* DMA control register */
+#define MX1_DMA_DISR		(MX1_DMA_BASE + 0x04)		/* DMA interrupt status register */
+#define MX1_DMA_DIMR		(MX1_DMA_BASE + 0x08)		/* DMA interrupt mask register */
+#define MX1_DMA_DBTOSR		(MX1_DMA_BASE + 0x0C)		/* DMA burst time-out status register */
+#define MX1_DMA_DRTOSR		(MX1_DMA_BASE + 0x10)		/* DMA request time-out status register */
+#define MX1_DMA_DSESR		(MX1_DMA_BASE + 0x14)		/* DMA transfer error status register */
+#define MX1_DMA_DBOSR		(MX1_DMA_BASE + 0x18)		/* DMA buffer overflow status register */
+#define MX1_DMA_DBTOCR		(MX1_DMA_BASE + 0x1C)		/* DMA burst time-out control register */
+#define MX1_DMA_WSRA		(MX1_DMA_BASE + 0x40)		/* W-size register A */
+#define MX1_DMA_XSRA		(MX1_DMA_BASE + 0x44)		/* X-size register A */
+#define MX1_DMA_YSRA		(MX1_DMA_BASE + 0x48)		/* Y-size register A */
+#define MX1_DMA_WSRB		(MX1_DMA_BASE + 0x4C)		/* W-size register B */
+#define MX1_DMA_XSRB		(MX1_DMA_BASE + 0x50)		/* X-size register B */
+#define MX1_DMA_YSRB		(MX1_DMA_BASE + 0x54)		/* Y-size register B */
+
+#define MX1_DMA_SAR0		(MX1_DMA_BASE + 0x80)		/* source address register 0 */
+#define MX1_DMA_DAR0		(MX1_DMA_BASE + 0x84)		/* destination address register 0 */
+#define MX1_DMA_CNTR0		(MX1_DMA_BASE + 0x88)		/* count register 0 */
+#define MX1_DMA_CCR0		(MX1_DMA_BASE + 0x8C)		/* channel control register 0 */
+#define MX1_DMA_RSSR0		(MX1_DMA_BASE + 0x90)		/* request source select register 0 */
+#define MX1_DMA_BLR0		(MX1_DMA_BASE + 0x94)		/* burst length register 0 */
+#define MX1_DMA_RTOR0		(MX1_DMA_BASE + 0x98)		/* request time-out register 0 */
+#define MX1_DMA_BUCR0		(MX1_DMA_BASE + 0x98)		/* bus utilization control register 0 */
 
 /* register set 1 to 10 are offseted by 0x40 each = 0x10 pointers away */
 
-#define	DMA_REG_SET_OFS		0x10
-
+#define DMA_REG_SET_OFS		0x10
 
 /* MX1 DMA module registers */
-#define	_reg_DMA_DCR		(*((P_VU32)MX1_DMA_DCR))
-#define	_reg_DMA_DISR		(*((P_VU32)MX1_DMA_DISR))
-#define	_reg_DMA_DIMR		(*((P_VU32)MX1_DMA_DIMR))
-#define	_reg_DMA_DBTOSR		(*((P_VU32)MX1_DMA_DBTOSR))
-#define	_reg_DMA_DRTOSR		(*((P_VU32)MX1_DMA_DRTOSR))
-#define	_reg_DMA_DSESR		(*((P_VU32)MX1_DMA_DSESR))
-#define	_reg_DMA_DBOSR		(*((P_VU32)MX1_DMA_DBOSR))
-#define	_reg_DMA_DBTOCR		(*((P_VU32)MX1_DMA_DBTOCR))	
-#define	_reg_DMA_WSRA		(*((P_VU32)MX1_DMA_WSRA))
-#define	_reg_DMA_XSRA		(*((P_VU32)MX1_DMA_XSRA))
-#define	_reg_DMA_YSRA		(*((P_VU32)MX1_DMA_YSRA))
-#define	_reg_DMA_WSRB		(*((P_VU32)MX1_DMA_WSRB))
-#define	_reg_DMA_XSRB		(*((P_VU32)MX1_DMA_XSRB))
-#define	_reg_DMA_YSRB		(*((P_VU32)MX1_DMA_YSRB))
-#define	_reg_DMA_SAR0		(*((P_VU32)MX1_DMA_SAR0))
-#define	_reg_DMA_DAR0		(*((P_VU32)MX1_DMA_DAR0))
-#define	_reg_DMA_CNTR0		(*((P_VU32)MX1_DMA_CNTR0))
-#define	_reg_DMA_CCR0		(*((P_VU32)MX1_DMA_CCR0))
-#define	_reg_DMA_RSSR0		(*((P_VU32)MX1_DMA_RSSR0))
-#define	_reg_DMA_BLR0		(*((P_VU32)MX1_DMA_BLR0))
-#define	_reg_DMA_RTOR0		(*((P_VU32)MX1_DMA_RTOR0))
-#define	_reg_DMA_BUCR0		(*((P_VU32)MX1_DMA_BUCR0))
+#define _reg_DMA_DCR		(*((P_VU32)MX1_DMA_DCR))
+#define _reg_DMA_DISR		(*((P_VU32)MX1_DMA_DISR))
+#define _reg_DMA_DIMR		(*((P_VU32)MX1_DMA_DIMR))
+#define _reg_DMA_DBTOSR		(*((P_VU32)MX1_DMA_DBTOSR))
+#define _reg_DMA_DRTOSR		(*((P_VU32)MX1_DMA_DRTOSR))
+#define _reg_DMA_DSESR		(*((P_VU32)MX1_DMA_DSESR))
+#define _reg_DMA_DBOSR		(*((P_VU32)MX1_DMA_DBOSR))
+#define _reg_DMA_DBTOCR		(*((P_VU32)MX1_DMA_DBTOCR))
+#define _reg_DMA_WSRA		(*((P_VU32)MX1_DMA_WSRA))
+#define _reg_DMA_XSRA		(*((P_VU32)MX1_DMA_XSRA))
+#define _reg_DMA_YSRA		(*((P_VU32)MX1_DMA_YSRA))
+#define _reg_DMA_WSRB		(*((P_VU32)MX1_DMA_WSRB))
+#define _reg_DMA_XSRB		(*((P_VU32)MX1_DMA_XSRB))
+#define _reg_DMA_YSRB		(*((P_VU32)MX1_DMA_YSRB))
+#define _reg_DMA_SAR0		(*((P_VU32)MX1_DMA_SAR0))
+#define _reg_DMA_DAR0		(*((P_VU32)MX1_DMA_DAR0))
+#define _reg_DMA_CNTR0		(*((P_VU32)MX1_DMA_CNTR0))
+#define _reg_DMA_CCR0		(*((P_VU32)MX1_DMA_CCR0))
+#define _reg_DMA_RSSR0		(*((P_VU32)MX1_DMA_RSSR0))
+#define _reg_DMA_BLR0		(*((P_VU32)MX1_DMA_BLR0))
+#define _reg_DMA_RTOR0		(*((P_VU32)MX1_DMA_RTOR0))
+#define _reg_DMA_BUCR0		(*((P_VU32)MX1_DMA_BUCR0))
 
 /*  DMA error type definition */
-#define	MX1_DMA_ERR_BTO		0	// burst time-out
-#define	MX1_DMA_ERR_RTO		1	// request time-out
-#define	MX1_DMA_ERR_TE		2	// transfer error
-#define	MX1_DMA_ERR_BO		3	// buffer overflow
-
+#define MX1_DMA_ERR_BTO		0	/* burst time-out */
+#define MX1_DMA_ERR_RTO		1	/* request time-out */
+#define MX1_DMA_ERR_TE		2	/* transfer error */
+#define MX1_DMA_ERR_BO		3	/* buffer overflow */
 
 /* Embedded SRAM */
 
 #define MX1_SRAM_BASE		0x00300000
 #define MX1_SRAM_SIZE		0x00020000
 
-#define 
-
+#define
 
-#define MX1ADS_SFLASH_BASE         0x0C000000
-#define MX1ADS_SFLASH_SIZE         SZ_16M
+#define MX1ADS_SFLASH_BASE	0x0C000000
+#define MX1ADS_SFLASH_SIZE	SZ_16M
 
-#define MX1ADS_IO_BASE             0x00200000
-#define MX1ADS_IO_SIZE             SZ_256K
+#define MX1ADS_IO_BASE		0x00200000
+#define MX1ADS_IO_SIZE		SZ_256K
 
-#define MX1ADS_VID_BASE            0x00300000
-#define MX1ADS_VID_SIZE            0x26000
+#define MX1ADS_VID_BASE		0x00300000
+#define MX1ADS_VID_SIZE		0x26000
 
-#define MX1ADS_VID_START           IO_ADDRESS(MX1ADS_VID_BASE)
+#define MX1ADS_VID_START	IO_ADDRESS(MX1ADS_VID_BASE)
 
-#define	MX1_GPIO_BASE				0x0021C000	// GPIO
-#define	MX1_EXT_UART_BASE			0x15000000	// external UART
-#define	MX1_TMR1_BASE				0x00202000	// Timer1
-#define 	MX1ADS_FLASH_BASE			0x0C000000	// sync FLASH
-#define	MX1_ESRAM_BASE				0x00300000	// embedded SRAM
-#define	MX1ADS_SDRAM_DISK_BASE	0x0B000000	// SDRAM disk base (last 16M of SDRAM)
+#define MX1_GPIO_BASE		0x0021C000	/* GPIO */
+#define MX1_EXT_UART_BASE	0x15000000	/* external UART */
+#define MX1_TMR1_BASE		0x00202000	/* Timer1 */
+#define MX1ADS_FLASH_BASE	0x0C000000	/* sync FLASH */
+#define MX1_ESRAM_BASE		0x00300000	/* embedded SRAM */
+#define MX1ADS_SDRAM_DISK_BASE	0x0B000000	/* SDRAM disk base (last 16M of SDRAM) */
 
 /* ------------------------------------------------------------------------
  *  Motorola MX1 system registers
@@ -1074,148 +911,141 @@ typedef	VU32	*		P_VU32;
  *
  */
 
-#define MX1ADS_AIPI1_OFFSET             0x00000
-#define MX1ADS_WDT_OFFSET               0x01000
-#define MX1ADS_TIM1_OFFSET              0x02000
-#define MX1ADS_TIM2_OFFSET              0x03000
-#define MX1ADS_RTC_OFFSET               0x04000
-#define MX1ADS_LCDC_OFFSET              0x05000
-#define MX1ADS_UART1_OFFSET             0x06000
-#define MX1ADS_UART2_OFFSET             0x07000
-#define MX1ADS_PWM_OFFSET               0x08000
-#define MX1ADS_DMAC_OFFSET              0x09000
-#define MX1ADS_AIPI2_OFFSET             0x10000
-#define MX1ADS_SIM_OFFSET               0x11000
-#define MX1ADS_USBD_OFFSET              0x12000
-#define MX1ADS_SPI1_OFFSET              0x13000
-#define MX1ADS_MMC_OFFSET               0x14000
-#define MX1ADS_ASP_OFFSET               0x15000
-#define MX1ADS_BTA_OFFSET               0x16000
-#define MX1ADS_I2C_OFFSET               0x17000
-#define MX1ADS_SSI_OFFSET               0x18000
-#define MX1ADS_SPI2_OFFSET              0x19000
-#define MX1ADS_MSHC_OFFSET              0x1A000
-#define MX1ADS_PLL_OFFSET               0x1B000
-#define MX1ADS_GPIO_OFFSET              0x1C000
-#define MX1ADS_EIM_OFFSET               0x20000
-#define MX1ADS_SDRAMC_OFFSET            0x21000
-#define MX1ADS_MMA_OFFSET               0x22000
-#define MX1ADS_AITC_OFFSET              0x23000
-#define MX1ADS_CSI_OFFSET               0x24000
-
+#define MX1ADS_AIPI1_OFFSET		0x00000
+#define MX1ADS_WDT_OFFSET		0x01000
+#define MX1ADS_TIM1_OFFSET		0x02000
+#define MX1ADS_TIM2_OFFSET		0x03000
+#define MX1ADS_RTC_OFFSET		0x04000
+#define MX1ADS_LCDC_OFFSET		0x05000
+#define MX1ADS_UART1_OFFSET		0x06000
+#define MX1ADS_UART2_OFFSET		0x07000
+#define MX1ADS_PWM_OFFSET		0x08000
+#define MX1ADS_DMAC_OFFSET		0x09000
+#define MX1ADS_AIPI2_OFFSET		0x10000
+#define MX1ADS_SIM_OFFSET		0x11000
+#define MX1ADS_USBD_OFFSET		0x12000
+#define MX1ADS_SPI1_OFFSET		0x13000
+#define MX1ADS_MMC_OFFSET		0x14000
+#define MX1ADS_ASP_OFFSET		0x15000
+#define MX1ADS_BTA_OFFSET		0x16000
+#define MX1ADS_I2C_OFFSET		0x17000
+#define MX1ADS_SSI_OFFSET		0x18000
+#define MX1ADS_SPI2_OFFSET		0x19000
+#define MX1ADS_MSHC_OFFSET		0x1A000
+#define MX1ADS_PLL_OFFSET		0x1B000
+#define MX1ADS_GPIO_OFFSET		0x1C000
+#define MX1ADS_EIM_OFFSET		0x20000
+#define MX1ADS_SDRAMC_OFFSET		0x21000
+#define MX1ADS_MMA_OFFSET		0x22000
+#define MX1ADS_AITC_OFFSET		0x23000
+#define MX1ADS_CSI_OFFSET		0x24000
 
 /*
  *  Register BASEs, based on OFFSETs
  *
  */
 
-#define MX1ADS_AIPI1_BASE             (MX1ADS_AIPI1_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_WDT_BASE               (MX1ADS_WDT_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_TIM1_BASE              (MX1ADS_TIM1_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_TIM2_BASE              (MX1ADS_TIM2_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_RTC_BASE               (MX1ADS_RTC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_LCDC_BASE              (MX1ADS_LCDC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_UART1_BASE             (MX1ADS_UART1_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_UART2_BASE             (MX1ADS_UART2_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_PWM_BASE               (MX1ADS_PWM_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_DMAC_BASE              (MX1ADS_DMAC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_AIPI2_BASE             (MX1ADS_AIPI2_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_SIM_BASE               (MX1ADS_SIM_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_USBD_BASE              (MX1ADS_USBD_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_SPI1_BASE              (MX1ADS_SPI1_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_MMC_BASE               (MX1ADS_MMC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_ASP_BASE               (MX1ADS_ASP_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_BTA_BASE               (MX1ADS_BTA_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_I2C_BASE               (MX1ADS_I2C_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_SSI_BASE               (MX1ADS_SSI_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_SPI2_BASE              (MX1ADS_SPI2_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_MSHC_BASE              (MX1ADS_MSHC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_PLL_BASE               (MX1ADS_PLL_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_GPIO_BASE              (MX1ADS_GPIO_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_EIM_BASE               (MX1ADS_EIM_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_SDRAMC_BASE            (MX1ADS_SDRAMC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_MMA_BASE               (MX1ADS_MMA_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_AITC_BASE              (MX1ADS_AITC_OFFSET + MX1ADS_IO_BASE)
-#define MX1ADS_CSI_BASE               (MX1ADS_CSI_OFFSET + MX1ADS_IO_BASE)
-
+#define MX1ADS_AIPI1_BASE		(MX1ADS_AIPI1_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_WDT_BASE			(MX1ADS_WDT_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_TIM1_BASE		(MX1ADS_TIM1_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_TIM2_BASE		(MX1ADS_TIM2_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_RTC_BASE			(MX1ADS_RTC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_LCDC_BASE		(MX1ADS_LCDC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_UART1_BASE		(MX1ADS_UART1_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_UART2_BASE		(MX1ADS_UART2_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_PWM_BASE			(MX1ADS_PWM_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_DMAC_BASE		(MX1ADS_DMAC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_AIPI2_BASE		(MX1ADS_AIPI2_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_SIM_BASE			(MX1ADS_SIM_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_USBD_BASE		(MX1ADS_USBD_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_SPI1_BASE		(MX1ADS_SPI1_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_MMC_BASE			(MX1ADS_MMC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_ASP_BASE			(MX1ADS_ASP_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_BTA_BASE			(MX1ADS_BTA_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_I2C_BASE			(MX1ADS_I2C_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_SSI_BASE			(MX1ADS_SSI_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_SPI2_BASE		(MX1ADS_SPI2_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_MSHC_BASE		(MX1ADS_MSHC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_PLL_BASE			(MX1ADS_PLL_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_GPIO_BASE		(MX1ADS_GPIO_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_EIM_BASE			(MX1ADS_EIM_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_SDRAMC_BASE		(MX1ADS_SDRAMC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_MMA_BASE			(MX1ADS_MMA_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_AITC_BASE		(MX1ADS_AITC_OFFSET + MX1ADS_IO_BASE)
+#define MX1ADS_CSI_BASE			(MX1ADS_CSI_OFFSET + MX1ADS_IO_BASE)
 
 /*
  *  MX1 Interrupt numbers
  *
  */
-#define INT_SOFTINT                 0
-#define CSI_INT                     6
-#define DSPA_MAC_INT                7
-#define DSPA_INT                    8
-#define COMP_INT                    9
-#define MSHC_XINT                   10
-#define GPIO_INT_PORTA              11
-#define GPIO_INT_PORTB              12
-#define GPIO_INT_PORTC              13
-#define LCDC_INT                    14
-#define SIM_INT                     15
-#define SIM_DATA_INT                16
-#define RTC_INT                     17
-#define RTC_SAMINT                  18
-#define UART2_MINT_PFERR            19
-#define UART2_MINT_RTS              20
-#define UART2_MINT_DTR              21
-#define UART2_MINT_UARTC            22
-#define UART2_MINT_TX               23
-#define UART2_MINT_RX               24
-#define UART1_MINT_PFERR            25
-#define UART1_MINT_RTS              26
-#define UART1_MINT_DTR              27
-#define UART1_MINT_UARTC            28
-#define UART1_MINT_TX               29
-#define UART1_MINT_RX               30
-#define VOICE_DAC_INT               31
-#define VOICE_ADC_INT               32
-#define PEN_DATA_INT                33
-#define PWM_INT                     34
-#define SDHC_INT                    35
-#define I2C_INT                     39
-#define CSPI_INT                    41
-#define SSI_TX_INT                  42
-#define SSI_TX_ERR_INT              43
-#define SSI_RX_INT                  44
-#define SSI_RX_ERR_INT              45
-#define TOUCH_INT                   46
-#define USBD_INT0                   47
-#define USBD_INT1                   48
-#define USBD_INT2                   49
-#define USBD_INT3                   50
-#define USBD_INT4                   51
-#define USBD_INT5                   52
-#define USBD_INT6                   53
-#define BTSYS_INT                   55
-#define BTTIM_INT                   56
-#define BTWUI_INT                   57
-#define TIMER2_INT                  58
-#define TIMER1_INT                  59
-#define DMA_ERR                     60
-#define DMA_INT                     61
-#define GPIO_INT_PORTD              62
-
-
-#define MAXIRQNUM                       62
-#define MAXFIQNUM                       62
-#define MAXSWINUM                       62
-
-
-#define TICKS_PER_uSEC                  24
+#define INT_SOFTINT			0
+#define CSI_INT				6
+#define DSPA_MAC_INT			7
+#define DSPA_INT			8
+#define COMP_INT			9
+#define MSHC_XINT			10
+#define GPIO_INT_PORTA			11
+#define GPIO_INT_PORTB			12
+#define GPIO_INT_PORTC			13
+#define LCDC_INT			14
+#define SIM_INT				15
+#define SIM_DATA_INT			16
+#define RTC_INT				17
+#define RTC_SAMINT			18
+#define UART2_MINT_PFERR		19
+#define UART2_MINT_RTS			20
+#define UART2_MINT_DTR			21
+#define UART2_MINT_UARTC		22
+#define UART2_MINT_TX			23
+#define UART2_MINT_RX			24
+#define UART1_MINT_PFERR		25
+#define UART1_MINT_RTS			26
+#define UART1_MINT_DTR			27
+#define UART1_MINT_UARTC		28
+#define UART1_MINT_TX			29
+#define UART1_MINT_RX			30
+#define VOICE_DAC_INT			31
+#define VOICE_ADC_INT			32
+#define PEN_DATA_INT			33
+#define PWM_INT				34
+#define SDHC_INT			35
+#define I2C_INT				39
+#define CSPI_INT			41
+#define SSI_TX_INT			42
+#define SSI_TX_ERR_INT			43
+#define SSI_RX_INT			44
+#define SSI_RX_ERR_INT			45
+#define TOUCH_INT			46
+#define USBD_INT0			47
+#define USBD_INT1			48
+#define USBD_INT2			49
+#define USBD_INT3			50
+#define USBD_INT4			51
+#define USBD_INT5			52
+#define USBD_INT6			53
+#define BTSYS_INT			55
+#define BTTIM_INT			56
+#define BTWUI_INT			57
+#define TIMER2_INT			58
+#define TIMER1_INT			59
+#define DMA_ERR				60
+#define DMA_INT				61
+#define GPIO_INT_PORTD			62
+
+#define MAXIRQNUM			62
+#define MAXFIQNUM			62
+#define MAXSWINUM			62
+
+#define TICKS_PER_uSEC			24
 
 /*
  *  These are useconds NOT ticks.
  *
  */
-#define mSEC_1                          1000
-#define mSEC_5                          (mSEC_1 * 5)
-#define mSEC_10                         (mSEC_1 * 10)
-#define mSEC_25                         (mSEC_1 * 25)
-#define SEC_1                           (mSEC_1 * 1000)
-
-
-#endif 
-
+#define mSEC_1				1000
+#define mSEC_5				(mSEC_1 * 5)
+#define mSEC_10				(mSEC_1 * 10)
+#define mSEC_25				(mSEC_1 * 25)
+#define SEC_1				(mSEC_1 * 1000)
 
+#endif