mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 01:24:27 +00:00
fix(nuvoton): prevent changing clock frequency
prevent changing clock frequency already set in BootBlock based on PLL value Change-Id: I8b4b53448cc8e703fd88ad6166f85a4fe3ba9e46 Signed-off-by: Margarita Glushkin <rutigl@gmail.com>
This commit is contained in:
parent
5318255f12
commit
fe8cc55a0c
2 changed files with 4 additions and 16 deletions
|
@ -132,11 +132,6 @@
|
||||||
*/
|
*/
|
||||||
#define PLAT_ARM_NS_IMAGE_BASE (ARM_DRAM1_BASE + UL(0x6208000))
|
#define PLAT_ARM_NS_IMAGE_BASE (ARM_DRAM1_BASE + UL(0x6208000))
|
||||||
|
|
||||||
#ifdef NPCM845X_DEBUG
|
|
||||||
#define COUNTER_FREQUENCY 0x07735940 /* f/4 = 125MHz */
|
|
||||||
#endif /* NPCM845X_DEBUG */
|
|
||||||
|
|
||||||
#define COUNTER_FREQUENCY 0x0EE6B280 /* f/2 = 250MHz */
|
|
||||||
#define PLAT_ARM_NSTIMER_FRAME_ID U(1)
|
#define PLAT_ARM_NSTIMER_FRAME_ID U(1)
|
||||||
|
|
||||||
/* GIC parameters */
|
/* GIC parameters */
|
||||||
|
|
|
@ -117,7 +117,10 @@ int board_uart_init(void)
|
||||||
|
|
||||||
unsigned int plat_get_syscnt_freq2(void)
|
unsigned int plat_get_syscnt_freq2(void)
|
||||||
{
|
{
|
||||||
return (unsigned int)COUNTER_FREQUENCY;
|
/*
|
||||||
|
* Do not overwrite the value set by BootBlock
|
||||||
|
*/
|
||||||
|
return (unsigned int)read_cntfrq_el0();
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
|
@ -324,23 +327,13 @@ void __init npcm845x_bl31_plat_arch_setup(void)
|
||||||
{
|
{
|
||||||
const mmap_region_t bl_regions[] = {
|
const mmap_region_t bl_regions[] = {
|
||||||
MAP_BL31_TOTAL,
|
MAP_BL31_TOTAL,
|
||||||
#if RECLAIM_INIT_CODE
|
|
||||||
MAP_BL_INIT_CODE_NOT_USED,
|
|
||||||
#endif /* RECLAIM_INIT_CODE */
|
|
||||||
ARM_MAP_BL_RO,
|
ARM_MAP_BL_RO,
|
||||||
#if USE_COHERENT_MEM
|
#if USE_COHERENT_MEM
|
||||||
ARM_MAP_BL_COHERENT_RAM,
|
ARM_MAP_BL_COHERENT_RAM,
|
||||||
#endif /* USE_COHERENT_MEM */
|
#endif /* USE_COHERENT_MEM */
|
||||||
ARM_MAP_SHARED_RAM,
|
ARM_MAP_SHARED_RAM,
|
||||||
#ifdef SECONDARY_BRINGUP
|
|
||||||
ARM_MAP_NS_DRAM1_NO_USED,
|
|
||||||
#ifdef BL32_BASE
|
|
||||||
ARM_MAP_BL32_CORE_MEM_NO_USED
|
|
||||||
#endif /* BL32_BASE */
|
|
||||||
#endif /* SECONDARY_BRINGUP */
|
|
||||||
{0}
|
{0}
|
||||||
};
|
};
|
||||||
setup_page_tables(bl_regions, plat_arm_get_mmap());
|
setup_page_tables(bl_regions, plat_arm_get_mmap());
|
||||||
enable_mmu_el3(0U);
|
enable_mmu_el3(0U);
|
||||||
NOTICE("Done enabling MMU\n");
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue