From: Kevin Hao <haokexin@gmail.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 11/11] powerpc: kill PPC_OF
Date: Thu, 26 Feb 2015 20:08:23 +0800 [thread overview]
Message-ID: <1424952503-8247-12-git-send-email-haokexin@gmail.com> (raw)
In-Reply-To: <1424952503-8247-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>
---
v2: No change.
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 5084bdcc6046..1734f8a338eb 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
prev parent reply other threads:[~2015-02-26 12:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 12:08 [PATCH v2 00/11] powerpc: kill PPC_OF Kevin Hao
2015-02-26 12:08 ` [PATCH v2 01/11] sata_svw: remove the dependency on PPC_OF Kevin Hao
2015-02-26 12:08 ` [PATCH v2 02/11] fbdev: aty128fb: replace PPC_OF with PPC Kevin Hao
2015-02-26 12:08 ` [PATCH v2 03/11] fbdev: radeon: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 04/11] fbdev: imsttfb: remove the dependency on PPC_OF Kevin Hao
2015-02-26 12:08 ` [PATCH v2 05/11] fbdev: nvidia: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 06/11] fbdev: riva: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 07/11] fbdev: remove the unnecessary includes of ppc specific header files Kevin Hao
2015-02-26 12:08 ` [PATCH v2 08/11] fbdev: kconfig: replace PPC_OF with PPC Kevin Hao
2015-02-26 12:08 ` [PATCH v2 09/11] mmc: " Kevin Hao
2015-03-05 13:50 ` Ulf Hansson
2015-02-26 12:08 ` [PATCH v2 10/11] tty: kconfig: remove the superfluous dependency on PPC_OF Kevin Hao
2015-03-07 2:32 ` Greg Kroah-Hartman
2015-02-26 12:08 ` Kevin Hao [this message]
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=1424952503-8247-12-git-send-email-haokexin@gmail.com \
--to=haokexin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).