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>

diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index b1b002c900218ae84620297ebce01034324c02c4..84eb8b466b71affcd17e236231306022dcd1c743 100644 (file)
--- 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 354137124d89d1aeb0d0bb0e25f7158bbc4c870b..059ffe1fd4f954a1669d00626239674884f66d40 100644 (file)
--- 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 */