Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1088a209 authored by Sylvain Munaut's avatar Sylvain Munaut Committed by Grant Likely
Browse files

[POWERPC] rheap: Changes config mechanism 



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: default avatarSylvain Munaut <tnt@246tNt.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent d4697af4

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -698,3 +698,7 @@ source "crypto/Kconfig" 
config PPC_CLOCK

	bool

	default n



config PPC_LIB_RHEAP

	bool

arch/powerpc/lib/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ endif 


obj-$(CONFIG_PPC64)	+= 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,6 +22,4 @@ ifeq ($(CONFIG_PPC64),y) 
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

arch/powerpc/platforms/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -264,6 +264,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).
@@ -274,6 +275,7 @@ config CPM2 
	bool

	default n

	select CPM

	select PPC_LIB_RHEAP

	help

	  The CPM2 (Communications Processor Module) is a coprocessor on

	  embedded CPUs made by Freescale.  Selecting this option means that

arch/powerpc/platforms/Kconfig.cputype

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ config PPC_8xx 
	select FSL_SOC

	select 8xx

	select WANT_DEVICE_TREE

	select PPC_LIB_RHEAP



config 40x

	bool "AMCC 40x"

arch/ppc/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config 44x 


config 8xx

	bool "8xx"

	select PPC_LIB_RHEAP



config E200

	bool "e200"
@@ -798,6 +799,7 @@ config CPM1 
config CPM2

	bool

	depends on 8260 || MPC8560 || MPC8555

	select PPC_LIB_RHEAP

	default y

	help

	  The CPM2 (Communications Processor Module) is a coprocessor on
@@ -1277,6 +1279,10 @@ config BOOT_LOAD 
config PIN_TLB

	bool "Pinned Kernel TLBs (860 ONLY)"

	depends on ADVANCED_OPTIONS && 8xx



config PPC_LIB_RHEAP

	bool



endmenu



source "net/Kconfig"