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

Commit 440bc685 authored by Ian Munsie's avatar Ian Munsie Committed by Benjamin Herrenschmidt
Browse files

powerpc: Update Kconfig + Makefile to prepare for server doorbells 



Move the rule to build doorbell support out of the Makefile and into a
new Kconfig boolean that platforms can select.

We will add doorbell support to pseries as well in the next patch.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Tested-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fe9e1d54

arch/powerpc/kernel/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,8 @@ endif 
obj64-$(CONFIG_HIBERNATION)	+= swsusp_asm64.o

obj64-$(CONFIG_HIBERNATION)	+= swsusp_asm64.o

obj-$(CONFIG_MODULES)		+= module.o module_$(CONFIG_WORD_SIZE).o

obj-$(CONFIG_MODULES)		+= module.o module_$(CONFIG_WORD_SIZE).o

obj-$(CONFIG_44x)		+= cpu_setup_44x.o

obj-$(CONFIG_44x)		+= cpu_setup_44x.o

obj-$(CONFIG_PPC_FSL_BOOK3E)	+= cpu_setup_fsl_booke.o dbell.o

obj-$(CONFIG_PPC_FSL_BOOK3E)	+= cpu_setup_fsl_booke.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= dbell.o

obj-$(CONFIG_PPC_DOORBELL)	+= dbell.o

obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o

obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o





extra-y				:= head_$(CONFIG_WORD_SIZE).o

extra-y				:= head_$(CONFIG_WORD_SIZE).o

arch/powerpc/platforms/Kconfig.cputype

+6 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ config PPC_BOOK3E_64 
	bool "Embedded processors"

	bool "Embedded processors"

	select PPC_FPU # Make it a choice ?

	select PPC_FPU # Make it a choice ?

	select PPC_SMP_MUXED_IPI

	select PPC_SMP_MUXED_IPI

	select PPC_DOORBELL





endchoice

endchoice
@@ -208,6 +209,7 @@ config PPC_FSL_BOOK3E 
	select FSL_EMB_PERFMON

	select FSL_EMB_PERFMON

	select PPC_SMP_MUXED_IPI

	select PPC_SMP_MUXED_IPI

	select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64

	select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64

	select PPC_DOORBELL

	default y if FSL_BOOKE

	default y if FSL_BOOKE





config PTE_64BIT

config PTE_64BIT
@@ -382,4 +384,8 @@ config NOT_COHERENT_CACHE 
config CHECK_CACHE_COHERENCY

config CHECK_CACHE_COHERENCY

	bool

	bool





config PPC_DOORBELL

	bool

	default n



endmenu
 
endmenu