Browse Source

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>
Masahiro Yamada 10 years ago
parent
commit
8c688bc4de

+ 0 - 7
README

@@ -623,13 +623,6 @@ The following options need to be configured:
 		exists, unlike the similar options in the Linux kernel. Do not
 		exists, unlike the similar options in the Linux kernel. Do not
 		set these options unless they apply!
 		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:
 - Linux Kernel Interface:
 		CONFIG_CLOCKS_IN_MHZ
 		CONFIG_CLOCKS_IN_MHZ
 
 

+ 0 - 4
include/config_fallbacks.h

@@ -79,10 +79,6 @@
 #define CONFIG_SYS_PROMPT	"=> "
 #define CONFIG_SYS_PROMPT	"=> "
 #endif
 #endif
 
 
-#ifndef CONFIG_SYS_HZ
-#define CONFIG_SYS_HZ		1000
-#endif
-
 #ifndef CONFIG_FIT_SIGNATURE
 #ifndef CONFIG_FIT_SIGNATURE
 #define CONFIG_IMAGE_FORMAT_LEGACY
 #define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 #endif

+ 0 - 1
include/configs/cm_fx6.h

@@ -19,7 +19,6 @@
 #define CONFIG_MX6
 #define CONFIG_MX6
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE		4273
 #define CONFIG_MACH_TYPE		4273
-#define CONFIG_SYS_HZ			1000
 
 
 #ifndef CONFIG_SPL_BUILD
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_DM
 #define CONFIG_DM

+ 0 - 1
include/configs/edb93xx.h

@@ -89,7 +89,6 @@
 #define CONFIG_EP93XX		1		/* in a Cirrus Logic 93xx SoC */
 #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_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 */
 #undef CONFIG_USE_IRQ				/* Don't need IRQ/FIQ */
 
 
 /* Monitor configuration */
 /* Monitor configuration */

+ 0 - 1
include/configs/ks2_evm.h

@@ -23,7 +23,6 @@
 #define CONFIG_ARMV7
 #define CONFIG_ARMV7
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_ARCH_TIMER
 #define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_TEXT_BASE		0x0c001000
 #define CONFIG_SYS_TEXT_BASE		0x0c001000
 #define CONFIG_SPL_TARGET		"u-boot-spi.gph"
 #define CONFIG_SPL_TARGET		"u-boot-spi.gph"
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_DCACHE_OFF

+ 0 - 1
include/configs/ls1021aqds.h

@@ -360,7 +360,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 
 
 #define CONFIG_SYS_LOAD_ADDR		0x82000000
 #define CONFIG_SYS_LOAD_ADDR		0x82000000
-#define CONFIG_SYS_HZ			1000
 
 
 /*
 /*
  * Stack sizes
  * Stack sizes

+ 0 - 1
include/configs/ls1021atwr.h

@@ -261,7 +261,6 @@
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 
 
 #define CONFIG_SYS_LOAD_ADDR		0x82000000
 #define CONFIG_SYS_LOAD_ADDR		0x82000000
-#define CONFIG_SYS_HZ			1000
 
 
 /*
 /*
  * Stack sizes
  * Stack sizes

+ 0 - 2
include/configs/ls2085a_common.h

@@ -253,8 +253,6 @@
 
 
 #define CONFIG_NR_DRAM_BANKS		3
 #define CONFIG_NR_DRAM_BANKS		3
 
 
-#define CONFIG_SYS_HZ			1000
-
 #define CONFIG_HWCONFIG
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 #define HWCONFIG_BUFFER_SIZE		128
 
 

+ 0 - 2
include/configs/sunxi-common.h

@@ -105,8 +105,6 @@
 /* standalone support */
 /* standalone support */
 #define CONFIG_STANDALONE_LOAD_ADDR	0x42000000
 #define CONFIG_STANDALONE_LOAD_ADDR	0x42000000
 
 
-#define CONFIG_SYS_HZ			1000
-
 /* baudrate */
 /* baudrate */
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BAUDRATE			115200
 
 

+ 0 - 1
include/configs/tqma6.h

@@ -450,7 +450,6 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_HZ			1000
 
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		(128u * SZ_1K)
 #define CONFIG_STACKSIZE		(128u * SZ_1K)

+ 8 - 0
lib/Kconfig

@@ -8,4 +8,12 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED
 
 
 	  If unsure, say N.
 	  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
 endmenu

+ 0 - 4
lib/time.c

@@ -10,10 +10,6 @@
 #include <div64.h>
 #include <div64.h>
 #include <asm/io.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
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default */
 # define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default */
 #endif
 #endif