Merge git://git.denx.de/u-boot into x1

Conflicts:

	drivers/usb/usb_ohci.c

3 files changed, 41 insertions, 20 deletions

diff --git a/cpu/sh4/start.S b/cpu/sh4/start.S
index a68ebb8..711ae66 100644
--- a/cpu/sh4/start.S
+++ b/cpu/sh4/start.S
@@ -69,6 +69,6 @@ loop:
 ._reloc_dst_end:	.long	reloc_dst_end
 ._bss_start:		.long	bss_start
 ._bss_end:		.long	bss_end
-._gd_init:		.long	(_start - CFG_GBL_DATA_SIZE)
-._stack_init:		.long	(_start - CFG_GBL_DATA_SIZE - CFG_MALLOC_LEN - 16)
+._gd_init:		.long	(_start - CONFIG_SYS_GBL_DATA_SIZE)
+._stack_init:		.long	(_start - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
 ._sh_generic_init:	.long	sh_generic_init
diff --git a/cpu/sh4/time.c b/cpu/sh4/time.c
index 5f8a3a0..77e0ae2 100644
--- a/cpu/sh4/time.c
+++ b/cpu/sh4/time.c
@@ -86,7 +86,7 @@ void reset_timer (void)
 void udelay (unsigned long usec)
 {
 	unsigned int start = get_timer (0);
-	unsigned int end = start + (usec * ((CFG_HZ + 500000) / 1000000));
+	unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000));
 
 	while (get_timer (0) < end)
 		continue;
@@ -94,5 +94,5 @@ void udelay (unsigned long usec)
 
 unsigned long get_tbclk (void)
 {
-	return CFG_HZ;
+	return CONFIG_SYS_HZ;
 }
diff --git a/cpu/sh4/watchdog.c b/cpu/sh4/watchdog.c
index 346e217..f692429 100644
--- a/cpu/sh4/watchdog.c
+++ b/cpu/sh4/watchdog.c
@@ -17,34 +17,55 @@
 
 #include <common.h>
 #include <asm/processor.h>
+#include <asm/io.h>
 
 #define WDT_BASE	WTCNT
 
-static unsigned char cnt_read (void){
-	return *((volatile unsigned char *)(WDT_BASE + 0x00));
+#define WDT_WD		(1 << 6)
+#define WDT_RST_P	(0)
+#define WDT_RST_M	(1 << 5)
+#define WDT_ENABLE	(1 << 7)
+
+#if defined(CONFIG_WATCHDOG)
+static unsigned char csr_read(void)
+{
+	return inb(WDT_BASE + 0x04);
 }
 
-static unsigned char csr_read (void){
-	return *((volatile unsigned char *)(WDT_BASE + 0x04));
+static void cnt_write(unsigned char value)
+{
+	outl((unsigned short)value | 0x5A00, WDT_BASE + 0x00);
 }
 
-static void cnt_write (unsigned char value){
-	while (csr_read() & (1 << 5)) {
-		/* delay */
-	}
-	*((volatile unsigned short *)(WDT_BASE + 0x00))
-		= ((unsigned short) value) | 0x5A00;
+static void csr_write(unsigned char value)
+{
+	outl((unsigned short)value | 0xA500, WDT_BASE + 0x04);
 }
 
-static void csr_write (unsigned char value){
-	*((volatile unsigned short *)(WDT_BASE + 0x04))
-		= ((unsigned short) value) | 0xA500;
+void watchdog_reset(void)
+{
+	outl(0x55000000, WDT_BASE + 0x08);
 }
 
+int watchdog_init(void)
+{
+	/* Set overflow time*/
+	cnt_write(0);
+	/* Power on reset */
+	csr_write(WDT_WD|WDT_RST_P|WDT_ENABLE);
+
+	return 0;
+}
 
-int watchdog_init (void){ return 0; }
+int watchdog_disable(void)
+{
+	csr_write(csr_read() & ~WDT_ENABLE);
+	return 0;
+}
+#endif
 
-void reset_cpu (unsigned long ignored)
+void reset_cpu(unsigned long ignored)
 {
-	while(1);
+	while (1)
+		;
 }