From 2196087b306952204eb38199437358161de2ae6b Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 28 Feb 2023 08:37:26 -0800 Subject: [PATCH 1/2] MAINTAINERS: drop uclinux.org uclinux.org is dead. Drop it from the MAINTAINERS file. Signed-off-by: Randy Dunlap Cc: Greg Ungerer Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Greg Ungerer --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0e64787aace8..eb16b704400b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21365,10 +21365,8 @@ F: include/uapi/linux/ublk_cmd.h UCLINUX (M68KNOMMU AND COLDFIRE) M: Greg Ungerer 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*/ From 8ab89e9563161921ffc86724eb3217d228eaad57 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 20 Mar 2023 14:54:18 +0100 Subject: [PATCH 2/2] m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE The configs ROMBASE and ROMSIZE were used in arch/m68k/68360/head-ram.S, which was removed with commit a3595962d824 ("m68knommu: remove obsolete 68360 support"). Remove the obsolete configs ROMBASE and ROMSIZE. Signed-off-by: Lukas Bulwahn Fixes: a3595962d82495f5 ("m68knommu: remove obsolete 68360 support") Reviewed-by: Geert Uytterhoeven Signed-off-by: Greg Ungerer --- arch/m68k/Kconfig.machine | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index e2f961208f18..255d50574065 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -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