Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
	cpu/arm1176/cpu.c
	cpu/arm1176/start.S
	cpu/arm_cortexa8/s5pc1xx/Makefile
	cpu/arm_cortexa8/s5pc1xx/clock.c
	drivers/serial/serial_s5p.c
	include/asm-arm/arch-s5pc1xx/clk.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/uart.h

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

1 files changed, 0 insertions, 74 deletions

diff --git a/cpu/microblaze/exception.c b/cpu/microblaze/exception.c
deleted file mode 100644
index 0365de3..0000000
--- a/cpu/microblaze/exception.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * (C) Copyright 2007 Michal Simek
- *
- * Michal  SIMEK <monstr@monstr.eu>
- *
- * 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
- */
-
-#include <common.h>
-#include <asm/asm.h>
-
-void _hw_exception_handler (void)
-{
-	int address = 0;
-	int state = 0;
-	/* loading address of exception EAR */
-	MFS (address, rear);
-	/* loading excetpion state register ESR */
-	MFS (state, resr);
-	printf ("Hardware exception at 0x%x address\n", address);
-	switch (state & 0x1f) {	/* mask on exception cause */
-	case 0x1:
-		puts ("Unaligned data access exception\n");
-		break;
-	case 0x2:
-		puts ("Illegal op-code exception\n");
-		break;
-	case 0x3:
-		puts ("Instruction bus error exception\n");
-		break;
-	case 0x4:
-		puts ("Data bus error exception\n");
-		break;
-	case 0x5:
-		puts ("Divide by zero exception\n");
-		break;
-#ifdef MICROBLAZE_V5
-	case 0x1000:
-		puts ("Exception in delay slot\n");
-		break;
-#endif
-	default:
-		puts ("Undefined cause\n");
-		break;
-	}
-	printf ("Unaligned %sword access\n", ((state & 0x800) ? "" : "half"));
-	printf ("Unaligned %s access\n", ((state & 0x400) ? "store" : "load"));
-	printf ("Register R%x\n", (state & 0x3E) >> 5);
-	hang ();
-}
-
-#ifdef CONFIG_SYS_USR_EXCEP
-void _exception_handler (void)
-{
-	puts ("User vector_exception\n");
-	hang ();
-}
-#endif