[Uboot-stm32] [PATCH] stv0991: remove specific CONFIG_STV0991 configs

[Patrice CHOTARD]

Hi Patrick

On 10/6/21 6:10 PM, Patrick Delaunay wrote:
> Remove the following STV0991 specific configs:
> - CONFIG_STV0991 (never used, only defined in CONFIG_SYS_EXTRA_OPTIONS)
> - CONFIG_STV0991_HZ (replaced by generic CONFIG_SYS_HZ)
> - CONFIG_STV0991_HZ_CLOCK (replaced by generic CONFIG_SYS_HZ_CLOCK)
> 
> This patch allows to reduce the file config_whitelist.txt.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  arch/arm/cpu/armv7/stv0991/timer.c              | 6 +++---
>  arch/arm/include/asm/arch-stv0991/stv0991_gpt.h | 4 ++--
>  configs/stv0991_defconfig                       | 1 -
>  scripts/config_whitelist.txt                    | 3 ---
>  4 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
> index 07033acb5c..67764ccf66 100644
> --- a/arch/arm/cpu/armv7/stv0991/timer.c
> +++ b/arch/arm/cpu/armv7/stv0991/timer.c
> @@ -18,7 +18,7 @@ static struct stv0991_cgu_regs *const stv0991_cgu_regs = \
>  				(struct stv0991_cgu_regs *) (CGU_BASE_ADDR);
>  
>  #define READ_TIMER()	(readl(&gpt1_regs_ptr->cnt) & GPT_FREE_RUNNING)
> -#define GPT_RESOLUTION	(CONFIG_STV0991_HZ_CLOCK / CONFIG_STV0991_HZ)
> +#define GPT_RESOLUTION	(CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ)
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> @@ -67,7 +67,7 @@ void __udelay(unsigned long usec)
>  {
>  	ulong tmo;
>  	ulong start = get_timer_masked();
> -	ulong tenudelcnt = CONFIG_STV0991_HZ_CLOCK / (1000 * 100);
> +	ulong tenudelcnt = CONFIG_SYS_HZ_CLOCK / (1000 * 100);
>  	ulong rndoff;
>  
>  	rndoff = (usec % 10) ? 1 : 0;
> @@ -110,5 +110,5 @@ unsigned long long get_ticks(void)
>   */
>  ulong get_tbclk(void)
>  {
> -	return CONFIG_STV0991_HZ;
> +	return CONFIG_SYS_HZ;
>  }
> diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
> index cd27472ad7..f1d5667c32 100644
> --- a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
> +++ b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
> @@ -36,7 +36,7 @@ struct gpt_regs *const gpt1_regs_ptr =
>  #define GPT_FREE_RUNNING		0xFFFF
>  
>  /* Timer, HZ specific defines */
> -#define CONFIG_STV0991_HZ		1000
> -#define CONFIG_STV0991_HZ_CLOCK		(27*1000*1000)/GPT_PRESCALER_128
> +#define CONFIG_SYS_HZ			1000
> +#define CONFIG_SYS_HZ_CLOCK		((27 * 1000 * 1000) / GPT_PRESCALER_128)
>  
>  #endif
> diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
> index b6ec831e6d..e06664047f 100644
> --- a/configs/stv0991_defconfig
> +++ b/configs/stv0991_defconfig
> @@ -12,7 +12,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
>  CONFIG_SYS_MALLOC_LEN=0x14000
>  CONFIG_DEFAULT_DEVICE_TREE="stv0991"
>  CONFIG_SYS_LOAD_ADDR=0x0
> -CONFIG_SYS_EXTRA_OPTIONS="STV0991"
>  CONFIG_BOOTDELAY=3
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 61ae682dcd..58f4b02f60 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1303,9 +1303,6 @@ CONFIG_STANDALONE_LOAD_ADDR
>  CONFIG_STATIC_BOARD_REV
>  CONFIG_STD_DEVICES_SETTINGS
>  CONFIG_STM32_FLASH
> -CONFIG_STV0991
> -CONFIG_STV0991_HZ
> -CONFIG_STV0991_HZ_CLOCK
>  CONFIG_SXNI855T
>  CONFIG_SYSFS
>  CONFIG_SYSMGR_ISWGRP_HANDOFF
> 
Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice