Re: [PATCH] m68k: merge the mmu and non-mmu kernel/Makefiles

Geert Uytterhoeven
2011-08-13T14:27:38Z

On Thu, Aug 11, 2011 at 06:47, <gerg@snapgear.com> wrote:
> --- a/arch/m68k/kernel/Makefile
> +++ b/arch/m68k/kernel/Makefile
> @@ -1,5 +1,20 @@
> -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 process.o ptrace.o setup.o signal.o \
> +          sys_m68k.o syscalltable.o time.o traps.o
> +
> +obj-y$(CONFIG_MMU_SUN3) += dma.o       # no, it's not a typo
> +obj-$(CONFIG_MMU)      += ints.o module.o devres.o

On MMU, we unconditionally build module.c.

> +devres-$(CONFIG_MMU)   = ../../../kernel/irq/devres.o
> +
> +ifndef CONFIG_MMU
> +obj-y                  += init_task.o irq.o
> +obj-$(CONFIG_MODULES)   += module.o

On nommu, it depends on CONFIG_MODULES.

However, most inside module.c is already protected by #ifdef CONFIG_MODULES.
Except for module_fixup(), which is empty for nommu. After moving the whole
module_fixup() inside #ifdef CONFIG_MMU, you can consolidate the module.o
entry in the Makefile.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds