diff options
| author | Tom Rini <trini@ti.com> | 2014-12-11 18:28:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-11 18:28:09 -0500 |
| commit | 2c49323d5de38e119f102fa3f5fb291c4bc4e8a0 (patch) | |
| tree | f64ddb2b5c393f6fac9a54dc98ea72c118922d70 /arch/arm/cpu/armv7/nonsec_virt.S | |
| parent | 9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326 (diff) | |
| parent | d0419f400af6f4bbe5c4ee5c97f6fbbdedec6cf3 (diff) | |
| download | u-boot-imx-2c49323d5de38e119f102fa3f5fb291c4bc4e8a0.zip u-boot-imx-2c49323d5de38e119f102fa3f5fb291c4bc4e8a0.tar.gz u-boot-imx-2c49323d5de38e119f102fa3f5fb291c4bc4e8a0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/cpu/armv7/nonsec_virt.S')
| -rw-r--r-- | arch/arm/cpu/armv7/nonsec_virt.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 745670e..30d81db 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -169,11 +169,11 @@ ENTRY(_nonsec_init) * we do this here instead. * But first check if we have the generic timer. */ -#ifdef CONFIG_SYS_CLK_FREQ +#ifdef CONFIG_TIMER_CLK_FREQ mrc p15, 0, r0, c0, c1, 1 @ read ID_PFR1 and r0, r0, #CPUID_ARM_GENTIMER_MASK @ mask arch timer bits cmp r0, #(1 << CPUID_ARM_GENTIMER_SHIFT) - ldreq r1, =CONFIG_SYS_CLK_FREQ + ldreq r1, =CONFIG_TIMER_CLK_FREQ mcreq p15, 0, r1, c14, c0, 0 @ write CNTFRQ #endif @@ -191,6 +191,9 @@ ENTRY(smp_waitloop) wfi ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address ldr r1, [r1] +#ifdef CONFIG_PEN_ADDR_BIG_ENDIAN + rev r1, r1 +#endif cmp r0, r1 @ make sure we dont execute this code beq smp_waitloop @ again (due to a spurious wakeup) mov r0, r1 |