diff mbox series

[U-Boot,1/3] imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig

Message ID 20180102004328.26325-1-stefan@agner.ch
State Changes Requested
Headers show
Series [U-Boot,1/3] imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig | expand

Commit Message

Stefan Agner Jan. 2, 2018, 12:43 a.m. UTC
Signed-off-by: Stefan Agner <stefan@agner.ch>
---

 arch/arm/mach-imx/Kconfig     | 3 +++
 arch/arm/mach-imx/mx7/Kconfig | 1 +
 include/configs/mx7_common.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

Comments

Stefan Agner Jan. 5, 2018, 10:26 a.m. UTC | #1
Hi Stefano,

Any chance to get this patchset still into v2018.01? IMHO it is almost a
bug that U-Boot does not initialize the ARM architected timer
properly...

--
Stefan


On 2018-01-02 01:43, Stefan Agner wrote:
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
> 
>  arch/arm/mach-imx/Kconfig     | 3 +++
>  arch/arm/mach-imx/mx7/Kconfig | 1 +
>  include/configs/mx7_common.h  | 1 -
>  scripts/config_whitelist.txt  | 1 -
>  4 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index e687048b31..653819123c 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -7,6 +7,9 @@ config IMX_CONFIG
>  config ROM_UNIFIED_SECTIONS
>  	bool
>  
> +config SYSCOUNTER_TIMER
> +	bool
> +
>  config IMX_RDC
>  	bool "i.MX Resource domain controller driver"
>  	depends on ARCH_MX6 || ARCH_MX7
> diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
> index 4f8b4e138e..2a3db860bb 100644
> --- a/arch/arm/mach-imx/mx7/Kconfig
> +++ b/arch/arm/mach-imx/mx7/Kconfig
> @@ -3,6 +3,7 @@ if ARCH_MX7
>  config MX7
>  	bool
>  	select ROM_UNIFIED_SECTIONS
> +	select SYSCOUNTER_TIMER
>  	select CPU_V7_HAS_VIRT
>  	select CPU_V7_HAS_NONSEC
>  	select ARCH_SUPPORT_PSCI
> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
> index 16e4d95ff4..17850400c1 100644
> --- a/include/configs/mx7_common.h
> +++ b/include/configs/mx7_common.h
> @@ -19,7 +19,6 @@
>  
>  /* Timer settings */
>  #define CONFIG_MXC_GPT_HCLK
> -#define CONFIG_SYSCOUNTER_TIMER
>  #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
>  #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
>  #define CONFIG_SYS_FSL_CLK
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 43a4ff0892..5d8d907cc4 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2219,7 +2219,6 @@ CONFIG_SUPPORT_RAW_INITRD
>  CONFIG_SUPPORT_VFAT
>  CONFIG_SUVD3
>  CONFIG_SXNI855T
> -CONFIG_SYSCOUNTER_TIMER
>  CONFIG_SYSFLAGS_ADDR
>  CONFIG_SYSFS
>  CONFIG_SYSMGR_ISWGRP_HANDOFF
Fabio Estevam Jan. 5, 2018, 12:36 p.m. UTC | #2
On Mon, Jan 1, 2018 at 10:43 PM, Stefan Agner <stefan@agner.ch> wrote:
> Signed-off-by: Stefan Agner <stefan@agner.ch>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Stefano Babic Jan. 5, 2018, 1:25 p.m. UTC | #3
Hi Stefan,

On 05/01/2018 11:26, Stefan Agner wrote:
> Hi Stefano,
> 
> Any chance to get this patchset still into v2018.01?

Yes !

Stefano

> IMHO it is almost a
> bug that U-Boot does not initialize the ARM architected timer
> properly...
> 
> --
> Stefan
> 
> 
> On 2018-01-02 01:43, Stefan Agner wrote:
>> Signed-off-by: Stefan Agner <stefan@agner.ch>
>> ---
>>
>>  arch/arm/mach-imx/Kconfig     | 3 +++
>>  arch/arm/mach-imx/mx7/Kconfig | 1 +
>>  include/configs/mx7_common.h  | 1 -
>>  scripts/config_whitelist.txt  | 1 -
>>  4 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
>> index e687048b31..653819123c 100644
>> --- a/arch/arm/mach-imx/Kconfig
>> +++ b/arch/arm/mach-imx/Kconfig
>> @@ -7,6 +7,9 @@ config IMX_CONFIG
>>  config ROM_UNIFIED_SECTIONS
>>  	bool
>>  
>> +config SYSCOUNTER_TIMER
>> +	bool
>> +
>>  config IMX_RDC
>>  	bool "i.MX Resource domain controller driver"
>>  	depends on ARCH_MX6 || ARCH_MX7
>> diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
>> index 4f8b4e138e..2a3db860bb 100644
>> --- a/arch/arm/mach-imx/mx7/Kconfig
>> +++ b/arch/arm/mach-imx/mx7/Kconfig
>> @@ -3,6 +3,7 @@ if ARCH_MX7
>>  config MX7
>>  	bool
>>  	select ROM_UNIFIED_SECTIONS
>> +	select SYSCOUNTER_TIMER
>>  	select CPU_V7_HAS_VIRT
>>  	select CPU_V7_HAS_NONSEC
>>  	select ARCH_SUPPORT_PSCI
>> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
>> index 16e4d95ff4..17850400c1 100644
>> --- a/include/configs/mx7_common.h
>> +++ b/include/configs/mx7_common.h
>> @@ -19,7 +19,6 @@
>>  
>>  /* Timer settings */
>>  #define CONFIG_MXC_GPT_HCLK
>> -#define CONFIG_SYSCOUNTER_TIMER
>>  #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
>>  #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
>>  #define CONFIG_SYS_FSL_CLK
>> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
>> index 43a4ff0892..5d8d907cc4 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -2219,7 +2219,6 @@ CONFIG_SUPPORT_RAW_INITRD
>>  CONFIG_SUPPORT_VFAT
>>  CONFIG_SUVD3
>>  CONFIG_SXNI855T
>> -CONFIG_SYSCOUNTER_TIMER
>>  CONFIG_SYSFLAGS_ADDR
>>  CONFIG_SYSFS
>>  CONFIG_SYSMGR_ISWGRP_HANDOFF
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index e687048b31..653819123c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -7,6 +7,9 @@  config IMX_CONFIG
 config ROM_UNIFIED_SECTIONS
 	bool
 
+config SYSCOUNTER_TIMER
+	bool
+
 config IMX_RDC
 	bool "i.MX Resource domain controller driver"
 	depends on ARCH_MX6 || ARCH_MX7
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 4f8b4e138e..2a3db860bb 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -3,6 +3,7 @@  if ARCH_MX7
 config MX7
 	bool
 	select ROM_UNIFIED_SECTIONS
+	select SYSCOUNTER_TIMER
 	select CPU_V7_HAS_VIRT
 	select CPU_V7_HAS_NONSEC
 	select ARCH_SUPPORT_PSCI
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 16e4d95ff4..17850400c1 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -19,7 +19,6 @@ 
 
 /* Timer settings */
 #define CONFIG_MXC_GPT_HCLK
-#define CONFIG_SYSCOUNTER_TIMER
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
 #define CONFIG_SYS_FSL_CLK
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43a4ff0892..5d8d907cc4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2219,7 +2219,6 @@  CONFIG_SUPPORT_RAW_INITRD
 CONFIG_SUPPORT_VFAT
 CONFIG_SUVD3
 CONFIG_SXNI855T
-CONFIG_SYSCOUNTER_TIMER
 CONFIG_SYSFLAGS_ADDR
 CONFIG_SYSFS
 CONFIG_SYSMGR_ISWGRP_HANDOFF