summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-10-24 01:30:40 +0900
committerTom Rini <trini@ti.com>2014-10-23 13:18:59 -0400
commit8c688bc4de4856f20193e6f0bc92e7273e8cf7ad (patch)
tree37d0383a340b19b3b4f290857e65af51212bb067
parentb2b8a6967a0579fd5cace0280d9cf0b54d3bbf1f (diff)
kconfig: move CONFIG_SYS_HZ to lib/Kconfig
CONFIG_SYS_HZ is always defined as 1000 in config_fallbacks.h (but some boards still have redundant definitions). This commit moves the definition and the document in README to Kconfig. Since lib/Kconfig can assure that CONFIG_SYS_HZ is 1000, the sanity check in lib/time.c should be removed. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reviewed-by: Marek Vasut <marex@denx.de>
-rw-r--r--README7
-rw-r--r--include/config_fallbacks.h4
-rw-r--r--include/configs/cm_fx6.h1
-rw-r--r--include/configs/edb93xx.h1
-rw-r--r--include/configs/ks2_evm.h1
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls2085a_common.h2
-rw-r--r--include/configs/sunxi-common.h2
-rw-r--r--include/configs/tqma6.h1
-rw-r--r--lib/Kconfig8
-rw-r--r--lib/time.c4
12 files changed, 8 insertions, 25 deletions
diff --git a/README b/README
index 4dbf2d4050..3ff793266b 100644
--- a/README
+++ b/README
@@ -623,13 +623,6 @@ The following options need to be configured:
exists, unlike the similar options in the Linux kernel. Do not
set these options unless they apply!
-- CPU timer options:
- CONFIG_SYS_HZ
-
- The frequency of the timer returned by get_timer().
- get_timer() must operate in milliseconds and this CONFIG
- option must be set to 1000.
-
- Linux Kernel Interface:
CONFIG_CLOCKS_IN_MHZ
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 76818f673f..7d8daa2b8e 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -79,10 +79,6 @@
#define CONFIG_SYS_PROMPT "=> "
#endif
-#ifndef CONFIG_SYS_HZ
-#define CONFIG_SYS_HZ 1000
-#endif
-
#ifndef CONFIG_FIT_SIGNATURE
#define CONFIG_IMAGE_FORMAT_LEGACY
#endif
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index a20c373321..f7277eb1d1 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -19,7 +19,6 @@
#define CONFIG_MX6
#define CONFIG_SYS_LITTLE_ENDIAN
#define CONFIG_MACH_TYPE 4273
-#define CONFIG_SYS_HZ 1000
#ifndef CONFIG_SPL_BUILD
#define CONFIG_DM
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 37bdcc0f33..47a8420f42 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -89,7 +89,6 @@
#define CONFIG_EP93XX 1 /* in a Cirrus Logic 93xx SoC */
#define CONFIG_SYS_CLK_FREQ 14745600 /* EP93xx has a 14.7456 clock */
-#define CONFIG_SYS_HZ 1000 /* decr freq: 1 ms ticks */
#undef CONFIG_USE_IRQ /* Don't need IRQ/FIQ */
/* Monitor configuration */
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index 51926f721f..137d9b0d32 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -23,7 +23,6 @@
#define CONFIG_ARMV7
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_TEXT_BASE 0x0c001000
#define CONFIG_SPL_TARGET "u-boot-spi.gph"
#define CONFIG_SYS_DCACHE_OFF
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 42214262f4..d1f6ea7e7b 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -360,7 +360,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
#define CONFIG_SYS_LOAD_ADDR 0x82000000
-#define CONFIG_SYS_HZ 1000
/*
* Stack sizes
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 5868287057..3c73af8ac3 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -261,7 +261,6 @@
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
#define CONFIG_SYS_LOAD_ADDR 0x82000000
-#define CONFIG_SYS_HZ 1000
/*
* Stack sizes
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
index a72e1f3567..6fe032c9ff 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -253,8 +253,6 @@
#define CONFIG_NR_DRAM_BANKS 3
-#define CONFIG_SYS_HZ 1000
-
#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1d947d7d9e..0c117bc5e7 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -105,8 +105,6 @@
/* standalone support */
#define CONFIG_STANDALONE_LOAD_ADDR 0x42000000
-#define CONFIG_SYS_HZ 1000
-
/* baudrate */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 2705d2c55f..d97a9613ae 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -450,7 +450,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_HZ 1000
#define CONFIG_CMDLINE_EDITING
#define CONFIG_STACKSIZE (128u * SZ_1K)
diff --git a/lib/Kconfig b/lib/Kconfig
index 88e5da72ec..a889c229cb 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -8,4 +8,12 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED
If unsure, say N.
+config SYS_HZ
+ int
+ default 1000
+ help
+ The frequency of the timer returned by get_timer().
+ get_timer() must operate in milliseconds and this option must be
+ set to 1000.
+
endmenu
diff --git a/lib/time.c b/lib/time.c
index c7b026498b..5ebd1be48f 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -10,10 +10,6 @@
#include <div64.h>
#include <asm/io.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