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

Commit 977b58e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "The bulk of the changes are generalizing the ColdFire v3 core support
  and adding in 537x CPU support.  Also a couple of other bug fixes, one
  to fix a reintroduction of a past bug in the romfs filesystem nommu
  support."

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: enable Timer on coldfire 532x
  m68knommu: fix ColdFire 5373/5329 QSPI base address
  m68knommu: add support for configuring a Freescale M5373EVB board
  m68knommu: add support for the ColdFire 537x family of CPUs
  m68knommu: make ColdFire M532x platform support more v3 generic
  m68knommu: create and use a common M53xx ColdFire class of CPUs
  m68k: remove unused asm/dbg.h
  m68k: Set ColdFire ACR1 cache mode depending on kernel configuration
  romfs: fix nommu map length to keep inside filesystem
  m68k: clean up unused "config ROMVECSIZE"
parents f5b8fcb4 2842e5b0

arch/m68k/Kconfig.cpu

+12 −0
Original line number Diff line number Diff line
@@ -223,13 +223,25 @@ config M5307 
	help

	  Motorola ColdFire 5307 processor support.



config M53xx

	bool



config M532x

	bool "MCF532x"

	depends on !MMU

	select M53xx

	select HAVE_CACHE_CB

	help

	  Freescale (Motorola) ColdFire 532x processor support.



config M537x

	bool "MCF537x"

	depends on !MMU

	select M53xx

	select HAVE_CACHE_CB

	help

	  Freescale ColdFire 537x processor support.



config M5407

	bool "MCF5407"

	depends on !MMU

arch/m68k/Kconfig.machine

+7 −9
Original line number Diff line number Diff line
@@ -358,6 +358,13 @@ config COBRA5329 
	help

	  Support for the senTec COBRA5329 board.



config M5373EVB

	bool "Freescale M5373EVB board support"

	depends on M537x

	select FREESCALE

	help

	  Support for the Freescale M5373EVB board.



config M5407C3

	bool "Motorola M5407C3 board support"

	depends on M5407
@@ -539,15 +546,6 @@ config ROMVEC 
	  68000 type variants the vectors are at the base of the boot device

	  on system startup.



config ROMVECSIZE

	hex "Size of ROM vector region (in bytes)"

	default "0x400"

	depends on ROM

	help

	  Define the size of the vector region in ROM. For most 68000

	  variants this would be 0x400 bytes in size. Set to 0 if you do

	  not want a vector region at the start of the ROM.



config ROMSTART

	hex "Address of the base of system image in ROM"

	default "0x400"

arch/m68k/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cpuflags-$(CONFIG_M5441x) := $(call cc-option,-mcpu=54455,-mcfv4e) 
cpuflags-$(CONFIG_M54xx)	:= $(call cc-option,-mcpu=5475,-m5200)

cpuflags-$(CONFIG_M5407)	:= $(call cc-option,-mcpu=5407,-m5200)

cpuflags-$(CONFIG_M532x)	:= $(call cc-option,-mcpu=532x,-m5307)

cpuflags-$(CONFIG_M537x)	:= $(call cc-option,-mcpu=537x,-m5307)

cpuflags-$(CONFIG_M5307)	:= $(call cc-option,-mcpu=5307,-m5200)

cpuflags-$(CONFIG_M528x)	:= $(call cc-option,-mcpu=528x,-m5307)

cpuflags-$(CONFIG_M5275)	:= $(call cc-option,-mcpu=5275,-m5307)

arch/m68k/include/asm/dbg.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#define DEBUG 1

#ifdef CONFIG_COLDFIRE

#define	BREAK asm volatile ("halt")

#else

#define BREAK *(volatile unsigned char *)0xdeadbee0 = 0

#endif

arch/m68k/include/asm/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define MAX_M68K_DMA_CHANNELS 4

#elif defined(CONFIG_M5272)

#define MAX_M68K_DMA_CHANNELS 1

#elif defined(CONFIG_M532x)

#elif defined(CONFIG_M53xx)

#define MAX_M68K_DMA_CHANNELS 0

#else

#define MAX_M68K_DMA_CHANNELS 2