linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Hao <haokexin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Kevin Hao <haokexin@gmail.com>
Subject: [PATCH 15/15] powerpc: kill PPC_OF
Date: Sat, 31 Jan 2015 21:47:45 +0800	[thread overview]
Message-ID: <1422712065-9403-16-git-send-email-haokexin@gmail.com> (raw)
In-Reply-To: <1422712065-9403-1-git-send-email-haokexin@gmail.com>

We have set CONFIG_PPC_OF to always 'y' in commit 0a498d96a332
("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: Kevin Hao <haokexin@gmail.com>
---
 arch/powerpc/Kconfig         | 3 ---
 arch/powerpc/Kconfig.debug   | 2 +-
 arch/powerpc/kernel/Makefile | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 22b0940494bb..c102668b4225 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index ec2e40f2cc11..bfd823abff93 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -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.
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 502cf69b6c89..c1ebbdaac28f 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -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
-- 
1.9.3

  parent reply	other threads:[~2015-01-31 13:49 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-31 13:47 [PATCH 00/15] powerpc: kill PPC_OF Kevin Hao
2015-01-31 13:47 ` [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF Kevin Hao
2015-02-02  2:28   ` Michael Ellerman
2015-02-02 15:47     ` Bjorn Helgaas
2015-02-03  0:25       ` Michael Ellerman
2015-02-03  1:37         ` [PATCH v2 01/15] PCI: Add pci_device_to_OF_node() stub " Kevin Hao
2015-02-03 15:31           ` Bjorn Helgaas
2015-02-03 15:29         ` [PATCH 01/15] PCI: introduce pci_device_to_OF_node() " Bjorn Helgaas
2015-02-03  1:02       ` Kevin Hao
2015-01-31 13:47 ` [PATCH 02/15] sata_svw: remove the dependency on PPC_OF Kevin Hao
2015-01-31 15:43   ` Tejun Heo
2015-01-31 13:47 ` [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC Kevin Hao
2015-02-27  0:11   ` Benjamin Herrenschmidt
2015-02-27  1:05     ` Kevin Hao
2015-02-27  2:05       ` Benjamin Herrenschmidt
2015-03-10 12:23       ` Tomi Valkeinen
2015-03-11  4:38         ` Kevin Hao
2015-03-11  7:51           ` Tomi Valkeinen
2015-01-31 13:47 ` [PATCH 04/15] fbdev: radeon: " Kevin Hao
2015-01-31 13:47 ` [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF Kevin Hao
2015-02-01  2:44   ` Stephen Rothwell
2015-02-01  5:51     ` Kevin Hao
2015-02-03  2:20       ` Kevin Hao
2015-02-03  2:34         ` Stephen Rothwell
2015-02-03  2:34       ` Stephen Rothwell
2015-01-31 13:47 ` [PATCH 06/15] fbdev: nvidia: " Kevin Hao
2015-01-31 13:47 ` [PATCH 07/15] fbdev: riva: " Kevin Hao
2015-01-31 13:47 ` [PATCH 08/15] fbdev: remove the unnecessary includes of ppc specific header files Kevin Hao
2015-01-31 13:47 ` [PATCH 09/15] fbdev: kconfig: replace PPC_OF with PPC Kevin Hao
2015-01-31 13:47 ` [PATCH 10/15] gpio: " Kevin Hao
2015-02-04 10:07   ` Linus Walleij
2015-01-31 13:47 ` [PATCH 11/15] mmc: " Kevin Hao
2015-01-31 13:47 ` [PATCH 12/15] mtd: " Kevin Hao
2015-02-06  4:08   ` Brian Norris
2015-01-31 13:47 ` [PATCH 13/15] tty: kconfig: remove the superfluous dependency on PPC_OF Kevin Hao
2015-01-31 13:47 ` [PATCH 14/15] usb: kconfig: replace PPC_OF with PPC Kevin Hao
2015-01-31 13:47 ` Kevin Hao [this message]
2015-02-02  2:25 ` [PATCH 00/15] powerpc: kill PPC_OF Michael Ellerman
2015-02-02  2:42   ` Kevin Hao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422712065-9403-16-git-send-email-haokexin@gmail.com \
    --to=haokexin@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).