diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-11 09:12:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-18 12:48:17 -0400 |
| commit | 0b5870c3f54d8da504866d70cf74b3b7ca3c49bb (patch) | |
| tree | fab6971804ae362b078cd4bb948f4c8977c328ad | |
| parent | 01d1b99c9b2d67207050c89f70801178ba9f4f2a (diff) | |
| download | u-boot-0b5870c3f54d8da504866d70cf74b3b7ca3c49bb.tar.gz | |
powerpc: Move CONFIG_BPTR_VIRT_ADDR out of CONFIG namespace
This is only used in one file, and is never overridden. Move this out
of CONFIG namespace.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/mp.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/config.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index b1b002c9002..84eb8b466b7 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -456,18 +456,18 @@ void setup_mp(void) flush_cache(bootpg, 4096); /* look for the tlb covering the reset page, there better be one */ - i = find_tlb_idx((void *)CONFIG_BPTR_VIRT_ADDR, 1); + i = find_tlb_idx((void *)BPTR_VIRT_ADDR, 1); /* we found a match */ if (i != -1) { /* map reset page to bootpg so we can copy code there */ disable_tlb(i); - set_tlb(1, CONFIG_BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */ + set_tlb(1, BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, /* perms, wimge */ 0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */ - memcpy((void *)CONFIG_BPTR_VIRT_ADDR, (void *)fixup, 4096); + memcpy((void *)BPTR_VIRT_ADDR, (void *)fixup, 4096); plat_mp_up(bootpg_map, pagesize); } else { diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 354137124d8..059ffe1fd4f 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -31,9 +31,7 @@ * Freescale's default e500 reset page. */ #if (defined(CONFIG_E500) && defined(CONFIG_MP)) -#ifndef CONFIG_BPTR_VIRT_ADDR -#define CONFIG_BPTR_VIRT_ADDR 0xfffff000 -#endif +#define BPTR_VIRT_ADDR 0xfffff000 #endif /* Since so many PPC SOCs have a semi-common LBC, define this here */ |