ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2023-04-28 16:37:54 -07:00
parent 70cc1b5307 8ab89e9563
commit b23c1376db
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -21516,10 +21516,8 @@ F: include/uapi/linux/ublk_cmd.h
UCLINUX (M68KNOMMU AND COLDFIRE) UCLINUX (M68KNOMMU AND COLDFIRE)
M: Greg Ungerer <gerg@linux-m68k.org> M: Greg Ungerer <gerg@linux-m68k.org>
L: linux-m68k@lists.linux-m68k.org L: linux-m68k@lists.linux-m68k.org
L: uclinux-dev@uclinux.org (subscribers-only)
S: Maintained S: Maintained
W: http://www.linux-m68k.org/ 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 T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
F: arch/m68k/*/*_no.* F: arch/m68k/*/*_no.*
F: arch/m68k/68*/ F: arch/m68k/68*/

17
arch/m68k/Kconfig.machine
View File

@@ -439,15 +439,6 @@ config ROM
that can be stored in flash, with possibly the text, and data that can be stored in flash, with possibly the text, and data
regions being copied out to RAM at startup. 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 config ROMVEC
hex "Address of the base of the ROM vectors" hex "Address of the base of the ROM vectors"
default "0" default "0"
@@ -465,14 +456,6 @@ config ROMSTART
Define the start address of the system image in ROM. Commonly this Define the start address of the system image in ROM. Commonly this
is strait after the ROM vectors. 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 choice
prompt "Kernel executes from" prompt "Kernel executes from"
help help