Patchwork [U-Boot,v3,1/3] config: consolidate CONFIG_SYS_HZ definition

login
register
mail settings
Submitter Rob Herring
Date Oct. 4, 2013, 1:40 p.m.
Message ID <1380894005-18769-2-git-send-email-robherring2@gmail.com>
Download mbox | patch
Permalink /patch/280612/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Rob Herring - Oct. 4, 2013, 1:40 p.m.
From: Rob Herring <rob.herring@calxeda.com>

According to the README, CONFIG_SYS_HZ must be 1000 and most platforms
follow that. In preparation to remove CONFIG_SYS_HZ from all these
platforms, provide a common definition. The platforms which use a value
other than 1000 will get build warning now. These configs are:

include/configs/M5271EVB.h:#define CONFIG_SYS_HZ                        1000000
include/configs/balloon3.h:#define      CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
include/configs/idmr.h:#define CONFIG_SYS_HZ                    (50000000 / 64)
include/configs/mini2440.h:#define CONFIG_SYS_HZ                        1562500
include/configs/mx1ads.h:#define CONFIG_SYS_HZ                  3686400
include/configs/omap3_zoom2.h:#define CONFIG_SYS_HZ                     ((V_SCLK) / (2 << CONFIG_SYS_PTV))
include/configs/omap730p2.h:#define CONFIG_SYS_HZ                       ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
include/configs/palmld.h:#define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
include/configs/palmtc.h:#define        CONFIG_SYS_HZ                   3686400         /* Timer @ 3686400 Hz */
include/configs/rsk7203.h:#define CONFIG_SYS_HZ                 (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7264.h:#define CONFIG_SYS_HZ         (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7269.h:#define CONFIG_SYS_HZ         (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/scb9328.h:#define CONFIG_SYS_HZ                 3686400      /* incrementer freq: 3.6864 MHz */
include/configs/versatile.h:#define CONFIG_SYS_HZ                       (1000000 / 256)
include/configs/zipitz2.h:#define       CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
v3:
- move warning to lib/time.c
- split to 3 patches

v2:
- Add warning for boards defining CONFIG_SYS_HZ. Boards using value
  other than 1000 will now generate warnings.
- Change KAREF, METROBOX, and MVBLUE to use 1000. Appeared to be a
  typo.
- Convert a few more boards to remove CONFIG_SYS_HZ that were missed in
  v1.

 include/config_fallbacks.h | 4 ++++
 lib/time.c                 | 4 ++++
 2 files changed, 8 insertions(+)

Patch

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index e59ee96..4c25289 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -53,4 +53,8 @@ 
 #define HAVE_BLOCK_DEVICE
 #endif
 
+#ifndef CONFIG_SYS_HZ
+#define CONFIG_SYS_HZ		1000
+#endif
+
 #endif	/* __CONFIG_FALLBACKS_H */
diff --git a/lib/time.c b/lib/time.c
index 68b8ff4..6514835 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -8,6 +8,10 @@ 
 #include <common.h>
 #include <watchdog.h>
 
+#if CONFIG_SYS_HZ != 1000
+#warning "CONFIG_SYS_HZ must be 1000 and should not be defined by platforms"
+#endif
+
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default*/
 #endif