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

[u-boot] / include / asm-blackfin / blackfin-config-post.h

diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h
index fea47371281d96be78fb54bba478e2003102587a..623fdc74c69fe5141799a4d2164cb5c553b1fb83 100644 (file)
--- a/include/asm-blackfin/blackfin-config-post.h
+++ b/include/asm-blackfin/blackfin-config-post.h
@@ -135,9 +135,13 @@
 #ifndef CONFIG_SYS_MAXARGS
 # define CONFIG_SYS_MAXARGS 16
 #endif
-#ifndef CONFIG_SYS_HZ
-# define CONFIG_SYS_HZ 1000
+#if defined(CONFIG_SYS_HZ)
+# if (CONFIG_SYS_HZ != 1000)
+#  warning "CONFIG_SYS_HZ must always be 1000"
+# endif
+# undef CONFIG_SYS_HZ
 #endif
+#define CONFIG_SYS_HZ 1000
 #ifndef CONFIG_SYS_BAUDRATE_TABLE
 # define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
 #endif