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

Commit 52d99627 authored by Kevin Hao's avatar Kevin Hao Committed by Michael Ellerman
Browse files

powerpc: kill PPC_OF 



We have set CONFIG_PPC_OF to always 'y' in commit 0a498d96
("powerpc: set CONFIG_PPC_OF=y always for ARCH=powerpc") nine years
ago. And the arch/ppc also has gone away for many years. The OF
functionality was also moved to a common place and be used by many
archs. So it does make no sense to keep such a option in the current
kernel. Just kill it.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f915b51c

arch/powerpc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ config ARCH_MAY_HAVE_PC_FDC 
	bool

	default PCI



config PPC_OF

	def_bool y



config PPC_UDBG_16550

	bool

	default n

arch/powerpc/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config BDI_SWITCH 


config BOOTX_TEXT

	bool "Support for early boot text console (BootX or OpenFirmware only)"

	depends on PPC_OF && PPC_BOOK3S

	depends on PPC_BOOK3S

	help

	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.

arch/powerpc/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ obj-y := cputable.o ptrace.o syscalls.o \ 
				   signal.o sysfs.o cacheinfo.o time.o \

				   prom.o traps.o setup-common.o \

				   udbg.o misc.o io.o dma.o \

				   misc_$(CONFIG_WORD_SIZE).o vdso32/

				   misc_$(CONFIG_WORD_SIZE).o vdso32/ \

				   of_platform.o prom_parse.o

obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \

				   signal_64.o ptrace32.o \

				   paca.o nvram_64.o firmware.o
@@ -47,7 +48,6 @@ obj-$(CONFIG_PPC64) += vdso64/ 
obj-$(CONFIG_ALTIVEC)		+= vecemu.o

obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o

obj-$(CONFIG_PPC_P7_NAP)	+= idle_power7.o

obj-$(CONFIG_PPC_OF)		+= of_platform.o prom_parse.o

procfs-y			:= proc_powerpc.o

obj-$(CONFIG_PROC_FS)		+= $(procfs-y)

rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI)	:= rtas_pci.o