From 308d73b96b8a098ee5b6ce9485340ab44cea3493 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 12 May 2007 21:23:57 +0200 Subject: [PATCH 02/21] powerpc: Changes the config mechanism for rheap Instead of having in the makefile all the option that requires rheap, we define a configuration symbol and when needed we make sure it's selected. Signed-off-by: Sylvain Munaut --- arch/powerpc/Kconfig | 1 + arch/powerpc/lib/Kconfig | 3 +++ arch/powerpc/lib/Makefile | 4 +--- arch/powerpc/platforms/Kconfig | 2 ++ arch/powerpc/platforms/Kconfig.cputype | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 arch/powerpc/lib/Kconfig Index: work-powerpc.git/arch/powerpc/Kconfig =================================================================== --- work-powerpc.git.orig/arch/powerpc/Kconfig +++ work-powerpc.git/arch/powerpc/Kconfig @@ -647,6 +647,7 @@ source "fs/Kconfig" source "arch/powerpc/sysdev/qe_lib/Kconfig" +source "arch/powerpc/lib/Kconfig" source "lib/Kconfig" menu "Instrumentation Support" Index: work-powerpc.git/arch/powerpc/lib/Kconfig =================================================================== --- /dev/null +++ work-powerpc.git/arch/powerpc/lib/Kconfig @@ -0,0 +1,3 @@ +config PPC_LIB_RHEAP + bool + default n Index: work-powerpc.git/arch/powerpc/lib/Makefile =================================================================== --- work-powerpc.git.orig/arch/powerpc/lib/Makefile +++ work-powerpc.git/arch/powerpc/lib/Makefile @@ -13,7 +13,6 @@ endif obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \ memcpy_64.o usercopy_64.o mem_64.o string.o -obj-$(CONFIG_QUICC_ENGINE) += rheap.o obj-$(CONFIG_XMON) += sstep.o obj-$(CONFIG_KPROBES) += sstep.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o @@ -23,5 +22,4 @@ obj-$(CONFIG_SMP) += locks.o endif # Temporary hack until we have migrated to asm-powerpc -obj-$(CONFIG_8xx) += rheap.o -obj-$(CONFIG_CPM2) += rheap.o +obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o Index: work-powerpc.git/arch/powerpc/platforms/Kconfig =================================================================== --- work-powerpc.git.orig/arch/powerpc/platforms/Kconfig +++ work-powerpc.git/arch/powerpc/platforms/Kconfig @@ -257,6 +257,7 @@ config TAU_AVERAGE config QUICC_ENGINE bool + select PPC_LIB_RHEAP help The QUICC Engine (QE) is a new generation of communications coprocessors on Freescale embedded CPUs (akin to CPM in older chips). @@ -266,6 +267,7 @@ config QUICC_ENGINE config CPM2 bool default n + select PPC_LIB_RHEAP help The CPM2 (Communications Processor Module) is a coprocessor on embedded CPUs made by Freescale. Selecting this option means that Index: work-powerpc.git/arch/powerpc/platforms/Kconfig.cputype =================================================================== --- work-powerpc.git.orig/arch/powerpc/platforms/Kconfig.cputype +++ work-powerpc.git/arch/powerpc/platforms/Kconfig.cputype @@ -36,6 +36,7 @@ config PPC_8xx bool "Freescale 8xx" select FSL_SOC select 8xx + select PPC_LIB_RHEAP config 40x bool "AMCC 40x"