[PATCH 4/5] move 86xx into multiplatform
From: Arnd Bergmann <arnd@arndb.de>
Date: 2007-07-12 21:52:29
MPC86xx based machines don't need their own kernel, but can run one that is shared with the other 6xx compatible machines, so we should allow that in Kconfig. Cc: Kumar Gala <redacted> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- Kumar, I don't remember if you still had objections to merging 86xx annd 83xx into multiplatform after our last discussion. Please Ack or Nack the two patches. Index: linux-2.6/arch/powerpc/platforms/86xx/Kconfig ===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/86xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/86xx/Kconfig@@ -1,18 +1,20 @@ -choice - prompt "86xx Board Type" - depends on PPC_86xx - default MPC8641_HPCN +config PPC_86xx + bool "Freescale 86xx based boards" + depends on 6xx + select FSL_SOC + select ALTIVEC + help + The Freescale E600 SoCs have 74xx cores. config MPC8641_HPCN bool "Freescale MPC8641 HPCN" + depends on PPC_86xx select PPC_I8259 select DEFAULT_UIMAGE select CPU_7450 help This option enables support for the MPC8641 HPCN board. -endchoice - config MPC8641 bool select PPC_INDIRECT_PCI
Index: linux-2.6/arch/powerpc/platforms/Kconfig ===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/Kconfig
+++ linux-2.6/arch/powerpc/platforms/Kconfig@@ -23,13 +23,6 @@ config PPC_83xx select 83xx select WANT_DEVICE_TREE -config PPC_86xx - bool "Freescale 86xx" - depends on 6xx - select FSL_SOC - select ALTIVEC - help - The Freescale E600 SoCs have 74xx cores. endchoice config CLASSIC32 --