leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stv0991: remove specific CONFIG_STV0991 configs

Browse Source 
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@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Patrick Delaunay
2021-10-06 18:10:32 +02:00
committed by Patrice Chotard
parent c7f85e1f61
commit 20a3969d33
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/cpu/armv7/stv0991/timer.c
View File

@@ -18,7 +18,7 @@ static struct stv0991_cgu_regs *const stv0991_cgu_regs = \
(struct stv0991_cgu_regs *) (CGU_BASE_ADDR); (struct stv0991_cgu_regs *) (CGU_BASE_ADDR);
#define READ_TIMER() (readl(&gpt1_regs_ptr->cnt) & GPT_FREE_RUNNING) #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; DECLARE_GLOBAL_DATA_PTR;
@@ -67,7 +67,7 @@ void __udelay(unsigned long usec)
{ {
ulong tmo; ulong tmo;
ulong start = get_timer_masked(); ulong start = get_timer_masked();
ulong tenudelcnt = CONFIG_STV0991_HZ_CLOCK / (1000 * 100); ulong tenudelcnt = CONFIG_SYS_HZ_CLOCK / (1000 * 100);
ulong rndoff; ulong rndoff;
rndoff = (usec % 10) ? 1 : 0; rndoff = (usec % 10) ? 1 : 0;
@@ -110,5 +110,5 @@ unsigned long long get_ticks(void)
*/ */
ulong get_tbclk(void) ulong get_tbclk(void)
{ {
return CONFIG_STV0991_HZ; return CONFIG_SYS_HZ;
} }

4
arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
View File

@@ -36,7 +36,7 @@ struct gpt_regs *const gpt1_regs_ptr =
#define GPT_FREE_RUNNING 0xFFFF #define GPT_FREE_RUNNING 0xFFFF
/* Timer, HZ specific defines */ /* Timer, HZ specific defines */
#define CONFIG_STV0991_HZ 1000 #define CONFIG_SYS_HZ 1000
#define CONFIG_STV0991_HZ_CLOCK (27*1000*1000)/GPT_PRESCALER_128 #define CONFIG_SYS_HZ_CLOCK ((27 * 1000 * 1000) / GPT_PRESCALER_128)
#endif #endif

1
configs/stv0991_defconfig
View File

@@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_OFFSET=0x30000 CONFIG_ENV_OFFSET=0x30000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DEFAULT_DEVICE_TREE="stv0991" CONFIG_DEFAULT_DEVICE_TREE="stv0991"
CONFIG_SYS_EXTRA_OPTIONS="STV0991"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"

3
scripts/config_whitelist.txt
View File

@@ -1423,9 +1423,6 @@ CONFIG_STACKBASE
CONFIG_STANDALONE_LOAD_ADDR CONFIG_STANDALONE_LOAD_ADDR
CONFIG_STATIC_BOARD_REV CONFIG_STATIC_BOARD_REV
CONFIG_STD_DEVICES_SETTINGS CONFIG_STD_DEVICES_SETTINGS
CONFIG_STV0991
CONFIG_STV0991_HZ
CONFIG_STV0991_HZ_CLOCK
CONFIG_SXNI855T CONFIG_SXNI855T
CONFIG_SYSFS CONFIG_SYSFS
CONFIG_SYSMGR_ISWGRP_HANDOFF CONFIG_SYSMGR_ISWGRP_HANDOFF