Minor coding style cleanup.

8 files changed, 68 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 0bff39eec..7425ceb2a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+commit 94abd7c0583ebe01e799b25f451201deeaab550d
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Wed Apr 4 01:49:15 2007 +0200
+
+    Minor cleanup.
+
 commit aea03c4e8c3a21ce43d3faf48a6e6d474c8bdf73
 Author: Gerald Van Baren <vanbaren@cideas.com>
 Date:	Sat Mar 31 14:30:53 2007 -0400
@@ -60,6 +66,32 @@ Date:	Sat Mar 31 11:59:59 2007 -0400
     This adds the applicable libfdt source files (unmodified) and a README
     to explain where the source came from.
 
+commit 342cd097be1e7affe82f42ab3da220959a699e64
+Author: Michal Simek <monstr@monstr.eu>
+Date:	Fri Mar 30 22:52:09 2007 +0200
+
+    [PATCH] Clean include dependence
+
+commit 6f934210fb293fde2cfb4251c6d96fdc58b6a906
+Author: Michal Simek <monstr@monstr.eu>
+Date:	Fri Mar 30 22:42:45 2007 +0200
+
+    [CLEAN] Remove inefficient Suzaku code
+
+commit 5da048adf44bea5e3b94080d02903c2e3fe7aa4a
+Author: Michal Simek <monstr@monstr.eu>
+Date:	Tue Mar 27 00:32:16 2007 +0200
+
+    PATCH: Resolve GPL license problem
+
+commit 1798049522f594013aea29457d46794298c6ae15
+Author: Michal Simek <root@monstr.eu>
+Date:	Mon Mar 26 01:39:07 2007 +0200
+
+    Support for XUPV2P board
+    Reset support
+    BSP autoconfig support
+
 commit 6eb1df835191d8ce4b81d5af40fa8e0fbe78e997
 Author: Jon Loeliger <jdl@freescale.com>
 Date:	Tue Dec 12 11:02:20 2006 -0600
@@ -266,6 +298,38 @@ Date:	Mon Mar 12 00:25:14 2007 +0800
 
     [Blackfin][PATCH] code cleanup
 
+commit cfc67116a706fd18b8f6a9c11a16753c5626d689
+Author: Michal Simek <monstr@monstr.eu>
+Date:	Sun Mar 11 13:48:24 2007 +0100
+
+    [Microblaze][PATCH] part 2
+    timer support
+    interrupt controller support
+    flash support
+    ethernet support
+    cache support
+    board information support
+    env support
+    booting image support
+
+    adding support for Xilinx ML401
+
+commit 76316a318de91f6184e7c22a10e02d275ade2441
+Author: Michal Simek <monstr@monstr.eu>
+Date:	Sun Mar 11 13:42:58 2007 +0100
+
+    [Microblaze][PATCH]
+    timer support
+    interrupt controller support
+    flash support
+    ethernet support
+    cache support
+    board information support
+    env support
+    booting image support
+
+    adding support for Xilinx ML401
+
 commit 8db13d63157811c839d15a313d9f2d2f5fd10af3
 Author: Aubrey Li <aubrey.adi@gmail.com>
 Date:	Sat Mar 10 23:49:29 2007 +0800
diff --git a/Makefile b/Makefile
index 92350500f..29b6210ff 100644
--- a/Makefile
+++ b/Makefile
@@ -2450,4 +2450,3 @@ backup:
 	gtar --force-local -zcvf `date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
 
 #########################################################################
-
diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c
index 5a7e59e63..d3403038e 100644
--- a/board/xilinx/xilinx_enet/emac_adapter.c
+++ b/board/xilinx/xilinx_enet/emac_adapter.c
@@ -147,7 +147,7 @@ eth_rx(void)
 	RecvFrameLength = PKTSIZE;
 	Result = XEmac_PollRecv(&Emac, (u8 *) etherrxbuff, &RecvFrameLength);
 	if (Result == XST_SUCCESS) {
-#ifndef CONFIG_EMACLITE 
+#ifndef CONFIG_EMACLITE
 		NetReceive((uchar *)etherrxbuff, RecvFrameLength);
 #else
 		NetReceive(etherrxbuff, RecvFrameLength);
diff --git a/cpu/microblaze/start.S b/cpu/microblaze/start.S
index 29481af9a..ca3befc24 100644
--- a/cpu/microblaze/start.S
+++ b/cpu/microblaze/start.S
@@ -54,7 +54,7 @@ _start:
 	lhu	r7, r1, r0
 	shi	r7, r0, 0x2
 	shi	r6, r0, 0x6
-/* 
+/*
  * Copy U-Boot code to TEXT_BASE
  * solve problem with sbrk_base
  */
diff --git a/include/asm-microblaze/microblaze_intc.h b/include/asm-microblaze/microblaze_intc.h
index 73f732c56..6635aeacb 100644
--- a/include/asm-microblaze/microblaze_intc.h
+++ b/include/asm-microblaze/microblaze_intc.h
@@ -38,4 +38,3 @@ struct irq_action {
 	void *arg;
 	int count; /* number of interrupt */
 };
-
diff --git a/include/asm-microblaze/microblaze_timer.h b/include/asm-microblaze/microblaze_timer.h
index b3d194bd4..844c8db11 100644
--- a/include/asm-microblaze/microblaze_timer.h
+++ b/include/asm-microblaze/microblaze_timer.h
@@ -39,4 +39,3 @@ typedef volatile struct microblaze_timer_t {
 	int loadreg; /* load register TLR */
 	int counter; /* timer/counter register */
 } microblaze_timer_t;
-
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index f4a8a1f22..cb159e79d 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -66,7 +66,7 @@
  *
  * CFG_GBL_DATA_OFFSET = 0x1000_0000 + 0x0400_0000 - 0x1000 = 0x13FF_F000
  * CFG_MONITOR_BASE = 0x13FF_F000 - 0x40000 = 0x13FB_F000
- * CFG_MALLOC_BASE = 0x13FB_F000 - 0x40000 = 0x13F7_F000 
+ * CFG_MALLOC_BASE = 0x13FB_F000 - 0x40000 = 0x13F7_F000
  *
  * 0x1000_0000	CFG_SDRAM_BASE
  *					FREE
diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 224db5c8b..a2f48102f 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -41,7 +41,7 @@
 
 /*
  * setting reset address
- * 
+ *
  * TEXT_BASE is set to place, where the U-BOOT run in RAM, but
  * if you want to store U-BOOT in flash, set CFG_RESET_ADDRESS
  * to FLASH memory and after loading bitstream jump to FLASH.