diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-21 16:21:00 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-10-18 14:22:25 +1000 |
| commit | 0a01b310fe6319d88690bd5a329c9e6a82ce7011 (patch) | |
| tree | 626ad0ea5f93b2efe210cc9ce6d6bcf0deb31fd1 /arch | |
| parent | 281eff5322fdb950a7dab722d15af811dda511d2 (diff) | |
| download | linux-3.10-0a01b310fe6319d88690bd5a329c9e6a82ce7011.tar.gz linux-3.10-0a01b310fe6319d88690bd5a329c9e6a82ce7011.tar.bz2 linux-3.10-0a01b310fe6319d88690bd5a329c9e6a82ce7011.zip | |
m68k: merge the mmu and non-mmu kernel/Makefiles
The few differences between the mmu and non-mmu kernel/Makefiles can
easily be handled inside of a single Makefile. Merge the 2 back into
a single Makefile.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/Makefile | 24 | ||||
| -rw-r--r-- | arch/m68k/kernel/Makefile_mm | 17 | ||||
| -rw-r--r-- | arch/m68k/kernel/Makefile_no | 10 |
3 files changed, 20 insertions, 31 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index c482ebc9dd5..ca686708ae0 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -1,5 +1,21 @@ -ifdef CONFIG_MMU -include arch/m68k/kernel/Makefile_mm -else -include arch/m68k/kernel/Makefile_no +# +# Makefile for the linux kernel. +# + +extra-$(CONFIG_MMU) := head.o +extra-$(CONFIG_SUN3) := sun3-head.o +extra-y += vmlinux.lds + +obj-y := entry.o m68k_ksyms.o module.o process.o ptrace.o setup.o signal.o \ + sys_m68k.o syscalltable.o time.o traps.o + +obj-$(CONFIG_MMU) += ints.o devres.o +devres-$(CONFIG_MMU) = ../../../kernel/irq/devres.o + +ifndef CONFIG_MMU_SUN3 +obj-y += dma.o endif +ifndef CONFIG_MMU +obj-y += init_task.o irq.o +endif + diff --git a/arch/m68k/kernel/Makefile_mm b/arch/m68k/kernel/Makefile_mm deleted file mode 100644 index aced6780457..00000000000 --- a/arch/m68k/kernel/Makefile_mm +++ /dev/null @@ -1,17 +0,0 @@ -# -# Makefile for the linux kernel. -# - -ifndef CONFIG_SUN3 - extra-y := head.o -else - extra-y := sun3-head.o -endif -extra-y += vmlinux.lds - -obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \ - sys_m68k.o time.o setup.o m68k_ksyms.o devres.o syscalltable.o - -devres-y = ../../../kernel/irq/devres.o - -obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo diff --git a/arch/m68k/kernel/Makefile_no b/arch/m68k/kernel/Makefile_no deleted file mode 100644 index 37c3fc074c0..00000000000 --- a/arch/m68k/kernel/Makefile_no +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile for arch/m68knommu/kernel. -# - -extra-y := vmlinux.lds - -obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \ - setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o - -obj-$(CONFIG_MODULES) += module.o |