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

Commit 78a768b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix 5329 ColdFire periphal addressing
  uclinux: add process name to allocation error message
  m68knommu: correct the mii calculations for 532x ColdFire FEC
  m68knommu: add ColdFire M532x to the FEC configuration options
  m68knommu: fix syscall restarting
  m68knommu: remove the obsolete and long unused comempci chip support
  m68knommu: remove the no longer used PCI support option
  m68knommu: remove obsolete and unused eLIA board
  m68knommu: set NO_DMA
  m68knommu: fix cache flushing for the 527x ColdFire processors
  m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
  m68knommu: use one exist from execption
parents d8204ee2 add8240e

arch/m68k/include/asm/cacheflush_no.h

+9 −2
Original line number Original line Diff line number Diff line
@@ -51,13 +51,20 @@ static inline void __flush_cache_all(void) 
		"movec	%%d0,%%CACR\n\t"

		"movec	%%d0,%%CACR\n\t"

		: : : "d0", "a0" );

		: : : "d0", "a0" );

#endif /* CONFIG_M5407 */

#endif /* CONFIG_M5407 */

#if defined(CONFIG_M527x) || defined(CONFIG_M528x)

#if defined(CONFIG_M523x) || defined(CONFIG_M527x)

	__asm__ __volatile__ (

		"movel	#0x81400100, %%d0\n\t"

		"movec	%%d0, %%CACR\n\t"

		"nop\n\t"

		: : : "d0" );

#endif /* CONFIG_M523x || CONFIG_M527x */

#if defined(CONFIG_M528x)

	__asm__ __volatile__ (

	__asm__ __volatile__ (

		"movel	#0x81000200, %%d0\n\t"

		"movel	#0x81000200, %%d0\n\t"

		"movec	%%d0, %%CACR\n\t"

		"movec	%%d0, %%CACR\n\t"

		"nop\n\t"

		"nop\n\t"

		: : : "d0" );

		: : : "d0" );

#endif /* CONFIG_M527x || CONFIG_M528x */

#endif /* CONFIG_M528x */

#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)

#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)

	__asm__ __volatile__ (

	__asm__ __volatile__ (

		"movel	#0x81000100, %%d0\n\t"

		"movel	#0x81000100, %%d0\n\t"

arch/m68k/include/asm/dma-mapping_no.h

+0 −4
Original line number Original line Diff line number Diff line 
#ifndef _M68KNOMMU_DMA_MAPPING_H

#ifndef _M68KNOMMU_DMA_MAPPING_H

#define _M68KNOMMU_DMA_MAPPING_H

#define _M68KNOMMU_DMA_MAPPING_H





#ifdef CONFIG_PCI

#include <asm-generic/dma-mapping.h>

#else

#include <asm-generic/dma-mapping-broken.h>

#include <asm-generic/dma-mapping-broken.h>

#endif





#endif  /* _M68KNOMMU_DMA_MAPPING_H */
 
#endif  /* _M68KNOMMU_DMA_MAPPING_H */

arch/m68k/include/asm/system_no.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz 
        jmp 0xf0000400;			\

        jmp 0xf0000400;			\

        ");				\

        ");				\

})

})

#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \

#elif defined(CONFIG_NETtel) || \

      defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)

      defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)

#define HARD_RESET_NOW() ({		\

#define HARD_RESET_NOW() ({		\

        asm("				\

        asm("				\

arch/m68knommu/Kconfig

+4 −23
Original line number Original line Diff line number Diff line
@@ -14,6 +14,10 @@ config MMU 
	bool

	bool

	default n

	default n





config NO_DMA

	bool

	default y



config FPU

config FPU

	bool

	bool

	default n

	default n
@@ -398,12 +402,6 @@ config M5307C3 
	help

	help

	  Support for the Motorola M5307C3 board.

	  Support for the Motorola M5307C3 board.





config eLIA

	bool "Moreton Bay eLIA board support"

	depends on M5307

	help

	  Support for the Moreton Bay eLIA board.



config SECUREEDGEMP3

config SECUREEDGEMP3

	bool "SnapGear SecureEdge/MP3 platform support"

	bool "SnapGear SecureEdge/MP3 platform support"

	depends on M5307

	depends on M5307
@@ -697,25 +695,8 @@ config ISA_DMA_API 
	depends on !M5272

	depends on !M5272

	default y

	default y





menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"



config PCI

	bool "PCI support"

	help

	  Support for PCI bus.



config COMEMPCI

	bool "CO-MEM lite PCI controller support"

	depends on (M5307 || M5407)



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"

source "drivers/pcmcia/Kconfig"





source "drivers/pci/hotplug/Kconfig"



endmenu



menu "Executable file formats"

menu "Executable file formats"





source "fs/Kconfig.binfmt"

source "fs/Kconfig.binfmt"

arch/m68knommu/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB 
board-$(CONFIG_M5275EVB)	:= M5275EVB

board-$(CONFIG_M5275EVB)	:= M5275EVB

board-$(CONFIG_M5282EVB)	:= M5282EVB

board-$(CONFIG_M5282EVB)	:= M5282EVB

board-$(CONFIG_ELITE)		:= eLITE

board-$(CONFIG_ELITE)		:= eLITE

board-$(CONFIG_eLIA)		:= eLIA

board-$(CONFIG_NETtel)		:= NETtel

board-$(CONFIG_NETtel)		:= NETtel

board-$(CONFIG_SECUREEDGEMP3)	:= MP3

board-$(CONFIG_SECUREEDGEMP3)	:= MP3

board-$(CONFIG_CLEOPATRA)	:= CLEOPATRA

board-$(CONFIG_CLEOPATRA)	:= CLEOPATRA