svn_rev_083

mx31/move_include_asm-arm_arch-arm1136_to_arch-omap24xx.diff

10 files changed, 6 insertions, 6 deletions

diff --git a/common/clock.c b/common/clock.c
index d500e5c539..1383f8be32 100644
--- a/common/clock.c
+++ b/common/clock.c
@@ -57,8 +57,8 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant)
 
 int is_timeout(uint64_t start_ns, uint64_t time_offset_ns)
 {
-	if (ctrlc ())
-		return -1;
+//	if (ctrlc ())
+//		return -1;
 
 	if (start_ns + time_offset_ns < get_time_ns())
 		return 1;
@@ -70,9 +70,9 @@ int udelay(unsigned long usecs)
 {
 	uint64_t start = get_time_ns();
 
-	while(!is_timeout(start, usecs * 1000))
-		if (ctrlc ())
-			return -1;
+	while(!is_timeout(start, usecs * 1000));
+//		if (ctrlc ())
+//			return -1;
 	return 0;
 }
 
diff --git a/include/asm-arm/arch-arm1136/bits.h b/include/asm-arm/arch-omap24xx/bits.h
index 8522335bfc..8522335bfc 100644
--- a/include/asm-arm/arch-arm1136/bits.h
+++ b/include/asm-arm/arch-omap24xx/bits.h
diff --git a/include/asm-arm/arch-arm1136/clocks.h b/include/asm-arm/arch-omap24xx/clocks.h
index 2a95af1810..2a95af1810 100644
--- a/include/asm-arm/arch-arm1136/clocks.h
+++ b/include/asm-arm/arch-omap24xx/clocks.h
diff --git a/include/asm-arm/arch-arm1136/i2c.h b/include/asm-arm/arch-omap24xx/i2c.h
index 7248950e52..7248950e52 100644
--- a/include/asm-arm/arch-arm1136/i2c.h
+++ b/include/asm-arm/arch-omap24xx/i2c.h
diff --git a/include/asm-arm/arch-arm1136/mem.h b/include/asm-arm/arch-omap24xx/mem.h
index c81f1c4370..c81f1c4370 100644
--- a/include/asm-arm/arch-arm1136/mem.h
+++ b/include/asm-arm/arch-omap24xx/mem.h
diff --git a/include/asm-arm/arch-arm1136/mux.h b/include/asm-arm/arch-omap24xx/mux.h
index 67c8419086..67c8419086 100644
--- a/include/asm-arm/arch-arm1136/mux.h
+++ b/include/asm-arm/arch-omap24xx/mux.h
diff --git a/include/asm-arm/arch-arm1136/omap2420.h b/include/asm-arm/arch-omap24xx/omap2420.h
index 1591986613..1591986613 100644
--- a/include/asm-arm/arch-arm1136/omap2420.h
+++ b/include/asm-arm/arch-omap24xx/omap2420.h
diff --git a/include/asm-arm/arch-arm1136/sys_info.h b/include/asm-arm/arch-omap24xx/sys_info.h
index 53c231a5e4..53c231a5e4 100644
--- a/include/asm-arm/arch-arm1136/sys_info.h
+++ b/include/asm-arm/arch-omap24xx/sys_info.h
diff --git a/include/asm-arm/arch-arm1136/sys_proto.h b/include/asm-arm/arch-omap24xx/sys_proto.h
index 9d8e5b2622..9d8e5b2622 100644
--- a/include/asm-arm/arch-arm1136/sys_proto.h
+++ b/include/asm-arm/arch-omap24xx/sys_proto.h
diff --git a/include/configs/eco920.h b/include/configs/eco920.h
index b072af2704..36f21a8ddd 100644
--- a/include/configs/eco920.h
+++ b/include/configs/eco920.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-//#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_LOWLEVEL_INIT
 
 /* ARM asynchronous clock */
 #define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */