diff options
| author | Tom Rini <[email protected]> | 2022-04-21 19:55:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-21 19:55:38 -0400 |
| commit | ea5583b90f9c162af6f2025718dc50ffbb6e4552 (patch) | |
| tree | 91f01f0434711bb9c31a311c0ba0e876c9627a8f /board | |
| parent | e50f66e364be80e02dd0834b84b830f3aade82ea (diff) | |
| parent | 151a030063898e5c8b03b40c3a96b073db0b0dc7 (diff) | |
Merge branch '2022-04-21-further-cleanups'
- Fix SPL_SYS_MALLOC_SIMPLE and non-SPL_FRAMEWORK boards (a large number
of PowerPC platforms)
- Remove duplication of crc16 functionality
- Migrate COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY and have it in
Kconfig
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/board.c | 6 | ||||
| -rw-r--r-- | board/xilinx/versal/board.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 89324159d55..371ed9eebaf 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -202,14 +202,14 @@ int board_init(void) * we avoid the risk of writing to it. */ asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r"(freq)); - if (freq != COUNTER_FREQUENCY) { + if (freq != CONFIG_COUNTER_FREQUENCY) { debug("arch timer frequency is %d Hz, should be %d, fixing ...\n", - freq, COUNTER_FREQUENCY); + freq, CONFIG_COUNTER_FREQUENCY); #ifdef CONFIG_NON_SECURE printf("arch timer frequency is wrong, but cannot adjust it\n"); #else asm volatile("mcr p15, 0, %0, c14, c0, 0" - : : "r"(COUNTER_FREQUENCY)); + : : "r"(CONFIG_COUNTER_FREQUENCY)); #endif } } diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 9940f2aeb33..2e2807eee46 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -74,7 +74,7 @@ int board_early_init_r(void) * Program freq register in System counter and * enable system counter. */ - writel(COUNTER_FREQUENCY, + writel(CONFIG_COUNTER_FREQUENCY, &iou_scntr_secure->base_frequency_id_register); debug("counter val 0x%x\n", |