From e9c4fc432f0de090b527702c69bb84a28e409bf3 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 18 Oct 2011 16:26:11 +1000 Subject: [PATCH] --- yaml --- r: 279740 b: refs/heads/master c: 0e6782c880e921106de645554939a5a714d8c865 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig | 5 ++++- trunk/arch/m68k/mm/Makefile | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c2602be1e7b7..4bfdb26dc892 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 066bf87b5c1b87f2eba7880b125f88e4f67e1c16 +refs/heads/master: 0e6782c880e921106de645554939a5a714d8c865 diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index 5f860cf67afc..330eb88108e7 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/arch/m68k/Kconfig @@ -88,9 +88,12 @@ config MMU config MMU_MOTOROLA bool +config MMU_COLDFIRE + bool + config MMU_SUN3 bool - depends on MMU && !MMU_MOTOROLA + depends on MMU && !MMU_MOTOROLA && !MMU_COLDFIRE menu "Platform setup" diff --git a/trunk/arch/m68k/mm/Makefile b/trunk/arch/m68k/mm/Makefile index 09cadf1058d5..cfbf3205724a 100644 --- a/trunk/arch/m68k/mm/Makefile +++ b/trunk/arch/m68k/mm/Makefile @@ -4,6 +4,8 @@ obj-y := init.o -obj-$(CONFIG_MMU) += cache.o fault.o hwtest.o -obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o -obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o +obj-$(CONFIG_MMU) += cache.o fault.o +obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o hwtest.o +obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o hwtest.o +obj-$(CONFIG_MMU_COLDFIRE) += kmap.o memory.o mcfmmu.o +