Commit 34fdd22c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "Just a couple of changes. Fixes to compilation of the old/legacy
  Freescale 68328 targets in some kernel configurations, and some
  default configuration updates.

  Summary:

   - fix build problems for legacy 68328 targets

   - clean out configs of removed options"

* tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: update config files
  m68knommu: fix non-mmu classic 68000 legacy timer tick selection
  m68knommu: fix non-specific 68328 choice interrupt build failure
parents 8aeab132 404b7577

arch/m68k/68000/ints.c

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
#include <asm/io.h>

#include <asm/machdep.h>



#if defined(CONFIG_M68328)

#include <asm/MC68328.h>

#elif defined(CONFIG_M68EZ328)

#if defined(CONFIG_M68EZ328)

#include <asm/MC68EZ328.h>

#elif defined(CONFIG_M68VZ328)

#include <asm/MC68VZ328.h>

#else

#include <asm/MC68328.h>

#endif



/* assembler routines */

arch/m68k/Kconfig.cpu

+1 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config M68000 
	select GENERIC_CSUM

	select CPU_NO_EFFICIENT_FFS

	select HAVE_ARCH_HASH

	select LEGACY_TIMER_TICK

	help

	  The Freescale (was Motorola) 68000 CPU is the first generation of

	  the well known M68K family of processors. The CPU core as well as
@@ -97,7 +98,6 @@ config M68060 
config M68328

	bool

	depends on !MMU

	select LEGACY_TIMER_TICK

	select M68000

	help

	  Motorola 68328 processor support.
@@ -105,7 +105,6 @@ config M68328 
config M68EZ328

	bool

	depends on !MMU

	select LEGACY_TIMER_TICK

	select M68000

	help

	  Motorola 68EX328 processor support.
@@ -113,7 +112,6 @@ config M68EZ328 
config M68VZ328

	bool

	depends on !MMU

	select LEGACY_TIMER_TICK

	select M68000

	help

	  Motorola 68VZ328 processor support.

arch/m68k/configs/amcore_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set
@@ -85,7 +82,6 @@ CONFIG_ROMFS_FS=y 
CONFIG_ROMFS_BACKED_BY_BOTH=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PRINTK_TIME=y

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

arch/m68k/configs/m5208evb_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

arch/m68k/configs/m5249evb_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set