Commit 2d2da475 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68knommu updates from Greg Ungerer:
 "A collection of changes to add elf-fdpic loader support for m68k.

  Also a collection of various fixes. They include typo corrections,
  undefined symbol compilation fixes, removal of the ISA_DMA_API support
  and removal of unused code.

  Summary:

   - correctly set up ZERO_PAGE pointer

   - drop ISA_DMA_API support

   - fix comment typos

   - fixes for undefined symbols

   - remove unused code and variables

   - elf-fdpic loader support for m68k"

* tag 'm68knommu-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix 68000 CPU link with no platform selected
  m68k: removed unused "mach_get_ss"
  m68knommu: fix undefined reference to `mach_get_rtc_pll'
  m68knommu: fix undefined reference to `_init_sp'
  m68knommu: allow elf_fdpic loader to be selected
  m68knommu: add definitions to support elf_fdpic program loader
  m68knommu: implement minimal regset support
  m68knommu: use asm-generic/mmu.h for nommu setups
  m68k: fix typos in comments
  m68k: coldfire: drop ISA_DMA_API support
  m68knommu: set ZERO_PAGE() to the allocated zeroed page
parents b00ed48b 6b8be804

arch/m68k/Kconfig.bus

+0 −10
Original line number Diff line number Diff line
@@ -56,16 +56,6 @@ config ATARI_ROM_ISA 
	  The only driver currently using this adapter is the EtherNEC

	  driver for RTL8019AS based NE2000 compatible network cards.



config GENERIC_ISA_DMA

	def_bool ISA



source "drivers/zorro/Kconfig"



endif
 


if COLDFIRE



config ISA_DMA_API

	def_bool !M5272



endif

arch/m68k/Kconfig.cpu

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ endchoice 
if M68KCLASSIC



config M68000

	bool

	def_bool y

	depends on !MMU

	select CPU_HAS_NO_BITFIELDS

	select CPU_HAS_NO_CAS

arch/m68k/Kconfig.machine

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ comment "Machine Options" 


config UBOOT

	bool "Support for U-Boot command line parameters"

	depends on COLDFIRE

	help

	  If you say Y here kernel will try to collect command

	  line parameters from the initial u-boot stack.

arch/m68k/coldfire/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1



obj-$(CONFIG_COLDFIRE)	+= cache.o clk.o device.o dma.o entry.o vectors.o

obj-$(CONFIG_COLDFIRE)	+= cache.o clk.o device.o entry.o vectors.o

obj-$(CONFIG_M5206)	+= m5206.o intc.o reset.o

obj-$(CONFIG_M5206e)	+= m5206.o intc.o reset.o

obj-$(CONFIG_M520x)	+= m520x.o intc-simr.o reset.o

arch/m68k/coldfire/dma.c

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/***************************************************************************/



/*

 *	dma.c -- Freescale ColdFire DMA support

 *

 *	Copyright (C) 2007, Greg Ungerer (gerg@snapgear.com)

 */



/***************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <asm/dma.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfdma.h>



/***************************************************************************/



/*

 *      DMA channel base address table.

 */

unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = {

#ifdef MCFDMA_BASE0

	MCFDMA_BASE0,

#endif

#ifdef MCFDMA_BASE1

	MCFDMA_BASE1,

#endif

#ifdef MCFDMA_BASE2

	MCFDMA_BASE2,

#endif

#ifdef MCFDMA_BASE3

	MCFDMA_BASE3,

#endif

};

EXPORT_SYMBOL(dma_base_addr);



unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];

EXPORT_SYMBOL(dma_device_address);



/***************************************************************************/