From 4674e8d385c34498a329fc31b41f449dc419014d Mon Sep 17 00:00:00 2001 From: Luis Alves Date: Wed, 24 Oct 2012 00:45:23 +0100 Subject: m68knommu: allow for configuration of true 68000 based systems Allow the M68000 option to be user configurable, for systems based on the original stand alone 68000 CPU. Signed-off-by: Luis Alves Signed-off-by: Greg Ungerer --- arch/m68k/Kconfig.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m68k/Kconfig.cpu') diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index c4eb79edecec..aad3b0bad7de 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -35,7 +35,7 @@ endchoice if M68KCLASSIC config M68000 - bool + bool "MC68000" select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 select CPU_HAS_NO_UNALIGNED -- cgit v1.2.3 From 9da1a84a9125dab0c95f045068e36512334ab473 Mon Sep 17 00:00:00 2001 From: Luis Alves Date: Thu, 25 Oct 2012 21:01:16 +0100 Subject: m68knommu: disable MC68000 cpu target when MMU is selected As pointed out by Geert, MC68000 target needs to be disabled when MMU support is enabled. From Geert: This needs a "depends on !MMU". Else allmodconfig will select it, causing -m68000 to be passed to the assembler, which may break the build depending on your version of binutils, a.o. arch/m68k/kernel/entry.S:186: Error: invalid instruction for this architecture; needs 68020 or higher (68020 [68k, 68ec020], 68030 [68ec030], 68040 [68ec040], 68060 [68ec060]) -- statement `bfextu %sp@(50){#0,#4},%d0' ignored arch/m68k/kernel/entry.S:211: Error: invalid operand mode for this architecture; needs 68020 or higher -- statement `jbsr @(sys_call_table,%d0:l:4)@(0)' ignored Cfr. http://kisskb.ellerman.id.au/kisskb/buildresult/7416877/ Signed-off-by: Luis Alves Signed-off-by: Greg Ungerer --- arch/m68k/Kconfig.cpu | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/m68k/Kconfig.cpu') diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index aad3b0bad7de..6708fa48e895 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -36,6 +36,7 @@ if M68KCLASSIC config M68000 bool "MC68000" + depends on !MMU select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 select CPU_HAS_NO_UNALIGNED -- cgit v1.2.3