Commit c3993f10 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt

powerpc: Remove CONFIG_POWER3

Now that we have dropped power3 support we can remove CONFIG_POWER3. The
usage in pgtable_32.c was already dead code as CONFIG_POWER3 was not
selectable on PPC32.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent cec15488
...@@ -268,8 +268,7 @@ extern const char *powerpc_base_platform; ...@@ -268,8 +268,7 @@ extern const char *powerpc_base_platform;
#endif #endif
#define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \ #define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \
!defined(CONFIG_POWER3) && !defined(CONFIG_POWER4) && \ !defined(CONFIG_POWER4) && !defined(CONFIG_BOOKE))
!defined(CONFIG_BOOKE))
#define CPU_FTRS_PPC601 (CPU_FTR_COMMON | CPU_FTR_601 | \ #define CPU_FTRS_PPC601 (CPU_FTR_COMMON | CPU_FTR_601 | \
CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE) CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE)
......
...@@ -41,7 +41,7 @@ unsigned long ioremap_base; ...@@ -41,7 +41,7 @@ unsigned long ioremap_base;
unsigned long ioremap_bot; unsigned long ioremap_bot;
EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */ EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
#if defined(CONFIG_6xx) || defined(CONFIG_POWER3) #ifdef CONFIG_6xx
#define HAVE_BATS 1 #define HAVE_BATS 1
#endif #endif
......
...@@ -140,10 +140,6 @@ config 6xx ...@@ -140,10 +140,6 @@ config 6xx
depends on PPC32 && PPC_BOOK3S depends on PPC32 && PPC_BOOK3S
select PPC_HAVE_PMU_SUPPORT select PPC_HAVE_PMU_SUPPORT
config POWER3
depends on PPC64 && PPC_BOOK3S
def_bool y
config POWER4 config POWER4
depends on PPC64 && PPC_BOOK3S depends on PPC64 && PPC_BOOK3S
def_bool y def_bool y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment