Commit b23c1376 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68knommu updates from Greg Ungerer:
 "A couple of minor changes.

  One to remove the long dead uclinux.org web address and email list
  from the MAINTAINERS entry for UCLINUX.

  The other to remove dead config options in the m68knommu Kconfig"

* tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE
  MAINTAINERS: drop uclinux.org
parents 70cc1b53 8ab89e95

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -21516,10 +21516,8 @@ F: include/uapi/linux/ublk_cmd.h 
UCLINUX (M68KNOMMU AND COLDFIRE)

M:	Greg Ungerer <gerg@linux-m68k.org>

L:	linux-m68k@lists.linux-m68k.org

L:	uclinux-dev@uclinux.org  (subscribers-only)

S:	Maintained

W:	http://www.linux-m68k.org/

W:	http://www.uclinux.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git

F:	arch/m68k/*/*_no.*

F:	arch/m68k/68*/

arch/m68k/Kconfig.machine

+0 −17
Original line number Diff line number Diff line
@@ -439,15 +439,6 @@ config ROM 
	  that can be stored in flash, with possibly the text, and data

	  regions being copied out to RAM at startup.



config ROMBASE

	hex "Address of the base of ROM device"

	default "0"

	depends on ROM

	help

	  Define the address that the ROM region starts at. Some platforms

	  use this to set their chip select region accordingly for the boot

	  device.



config ROMVEC

	hex "Address of the base of the ROM vectors"

	default "0"
@@ -465,14 +456,6 @@ config ROMSTART 
	  Define the start address of the system image in ROM. Commonly this

	  is strait after the ROM vectors.



config ROMSIZE

	hex "Size of the ROM device"

	default "0x100000"

	depends on ROM

	help

	  Size of the ROM device. On some platforms this is used to setup

	  the chip select that controls the boot ROM device.



choice

	prompt "Kernel executes from"

	help