On 10/07/2016 07:21 PM, Alison Wang wrote:

Hi, York,

...

On 09/23/2016 01:15 AM, Alison Wang wrote:

...

GENERIC_TIMER_CLK and CONFIG_TIMER_CLK_FREQ are both used to define Generic Timer frequency. It is reduplicate. This patch will remove GENERIC_TIMER_CLK macro.

Signed-off-by: Alison Wang alison.wang@nxp.com

arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- include/configs/ls1021aqds.h | 5 ----- include/configs/ls1021atwr.h | 5 ----- 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index 8f38680..9efb6d8 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -36,7 +36,7 @@

.align 5

-#define ONE_MS (GENERIC_TIMER_CLK / 1000) +#define ONE_MS (CONFIG_TIMER_CLK_FREQ / 1000) #define RESET_WAIT (30 * ONE_MS)

Alison,

Can you use GENERIC_TIMER_CLK? Recent change in U-Boot doesn't favor using CONFIG_* macros.

[Alison Wang] If GENERIC_TIMER_CLK is used and CONFIG_TIMER_CLK_FREQ is removed, I need to modify the generic codes which use CONFIG_TIMER_CLK_FREQ in arch/arm/cpu/armv7/nonsec_virt.S. Some other platforms may be affected. So I remove GENERIC_TIMER_CLK in v1.

What's your idea?

If it is too much change, then keep your current patch. We will come back to these CONFIG_* macros later anyway.

York