diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-03 22:38:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-03 22:38:36 +0200 |
| commit | 0d8cb9c04facc029baf4beee5a7e389be343a915 (patch) | |
| tree | eb6e1a1a99dde1e957746f3ea7f0c20ce2e515d9 /include/asm-blackfin | |
| parent | 3405f38a15eec5092ac47efe0829f10a24491c6e (diff) | |
| parent | 40587701924aa0afc86b3840421b4cc6de42c748 (diff) | |
| download | u-boot-imx-0d8cb9c04facc029baf4beee5a7e389be343a915.zip u-boot-imx-0d8cb9c04facc029baf4beee5a7e389be343a915.tar.gz u-boot-imx-0d8cb9c04facc029baf4beee5a7e389be343a915.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include/asm-blackfin')
| -rw-r--r-- | include/asm-blackfin/blackfin-config-post.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index fea4737..623fdc7 100644 --- 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 |