[1/4] powerpc: Move core kernel logic into arch/powerpc/Kbuild

Message ID 20181010051308.25422-1-mpe@ellerman.id.au
State Accepted
Commit c47ca98d32a22a412ddbc69916cf62bdcdfa1a4e
Headers show
Series
  • [1/4] powerpc: Move core kernel logic into arch/powerpc/Kbuild
Related show

Checks

Context Check Description
snowpatch_ozlabs/checkpatch success Test checkpatch on branch next
snowpatch_ozlabs/apply_patch success next/apply_patch Successfully applied

Commit Message

Michael Ellerman Oct. 10, 2018, 5:13 a.m.
This is a nice cleanup, arch/powerpc/Makefile is long and messy so
moving this out helps a little.

It also allows us to do:

  $ make arch/powerpc

Which can be helpful if you just want to compile test some changes to
arch code and not link everything.

Finally it also gives us a single place to do subdir-cc-flags
assignments which affect the whole of arch/powerpc, which we will do
in a future patch.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/Kbuild   | 14 ++++++++++++++
 arch/powerpc/Makefile | 14 ++------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 arch/powerpc/Kbuild

Comments

Michael Ellerman Oct. 19, 2018, 2:51 a.m. | #1
On Wed, 2018-10-10 at 05:13:05 UTC, Michael Ellerman wrote:
> This is a nice cleanup, arch/powerpc/Makefile is long and messy so
> moving this out helps a little.
> 
> It also allows us to do:
> 
>   $ make arch/powerpc
> 
> Which can be helpful if you just want to compile test some changes to
> arch code and not link everything.
> 
> Finally it also gives us a single place to do subdir-cc-flags
> assignments which affect the whole of arch/powerpc, which we will do
> in a future patch.
> 
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Applied to powerpc next.

https://git.kernel.org/powerpc/c/c47ca98d32a22a412ddbc69916cf62

cheers

Patch

diff --git a/arch/powerpc/Kbuild b/arch/powerpc/Kbuild
new file mode 100644
index 000000000000..690a498da050
--- /dev/null
+++ b/arch/powerpc/Kbuild
@@ -0,0 +1,14 @@ 
+obj-y += kernel/
+obj-y += mm/
+obj-y += lib/
+obj-y += sysdev/
+obj-y += platforms/
+obj-y += math-emu/
+obj-y += crypto/
+obj-y += net/
+
+obj-$(CONFIG_XMON) += xmon/
+obj-$(CONFIG_KVM)  += kvm/
+
+obj-$(CONFIG_PERF_EVENTS) += perf/
+obj-$(CONFIG_KEXEC_FILE)  += purgatory/
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 974103254aed..e623abaa573e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -269,18 +269,8 @@  head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o
 head-$(CONFIG_ALTIVEC)		+= arch/powerpc/kernel/vector.o
 head-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)  += arch/powerpc/kernel/prom_init.o
 
-core-y				+= arch/powerpc/kernel/ \
-				   arch/powerpc/mm/ \
-				   arch/powerpc/lib/ \
-				   arch/powerpc/sysdev/ \
-				   arch/powerpc/platforms/ \
-				   arch/powerpc/math-emu/ \
-				   arch/powerpc/crypto/ \
-				   arch/powerpc/net/
-core-$(CONFIG_XMON)		+= arch/powerpc/xmon/
-core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/
-core-$(CONFIG_PERF_EVENTS)	+= arch/powerpc/perf/
-core-$(CONFIG_KEXEC_FILE)	+= arch/powerpc/purgatory/
+# See arch/powerpc/Kbuild for content of core part of the kernel
+core-y += arch/powerpc/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/