diff options
| author | Tom Rini <[email protected]> | 2020-04-25 08:20:22 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-04-25 08:20:22 -0400 |
| commit | d202f67db0771247de562af5d6a5df778702857b (patch) | |
| tree | 7c48f316e008c90e19b54f93e1ede85bfe237fcb /common | |
| parent | 4d131cdb6762694fc1a66d6b3e39a82f9ec691cf (diff) | |
| parent | 691132e850539cb0956a106933d5bde37470bfc7 (diff) | |
Merge branch '2020-04-25-master-imports'
- Assorted minor fixes
- Actions S700 SoC and Cubieboard7 support
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 29 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 3 |
2 files changed, 3 insertions, 29 deletions
diff --git a/common/board_f.c b/common/board_f.c index 2ec5dbaa684..5c650f046cf 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -385,33 +385,10 @@ static int reserve_round_4k(void) return 0; } -#ifdef CONFIG_ARM -__weak int reserve_mmu(void) +__weak int arch_reserve_mmu(void) { -#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) - /* reserve TLB table */ - gd->arch.tlb_size = PGTABLE_SIZE; - gd->relocaddr -= gd->arch.tlb_size; - - /* round down to next 64 kB limit */ - gd->relocaddr &= ~(0x10000 - 1); - - gd->arch.tlb_addr = gd->relocaddr; - debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr, - gd->arch.tlb_addr + gd->arch.tlb_size); - -#ifdef CONFIG_SYS_MEM_RESERVE_SECURE - /* - * Record allocated tlb_addr in case gd->tlb_addr to be overwritten - * with location within secure ram. - */ - gd->arch.tlb_allocated = gd->arch.tlb_addr; -#endif -#endif - return 0; } -#endif static int reserve_video(void) { @@ -979,9 +956,7 @@ static const init_fnc_t init_sequence_f[] = { reserve_pram, #endif reserve_round_4k, -#ifdef CONFIG_ARM - reserve_mmu, -#endif + arch_reserve_mmu, reserve_video, reserve_trace, reserve_uboot, diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 69dabd27f6d..c51e4beb1c0 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -425,8 +425,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, debug("%s: DT overlay %s applied\n", __func__, fit_get_name(fit, node, NULL)); } - if (tmpbuffer) - free(tmpbuffer); + free(tmpbuffer); if (ret) return ret; } |