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

Commit 0a01b310 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 281eff53
Loading
Loading
Loading
Loading
+20 −4
Original line number Diff line number Diff line
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

arch/m68k/kernel/Makefile_mm

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line
#
# 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

arch/m68k/kernel/Makefile_no

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
#
# 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