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

Commit 4b4d2b46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull h8300 platform removal from Guenter Roeck:
 "The patch series has been in -next for more than one relase cycle.  I
  did get a number of Acks, and no objections.

  H8/300 has been dead for several years, the kernel for it has not
  compiled for ages, and recent versions of gcc for it are broken.
  Remove support for it"

* tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  CREDITS: Add Yoshinori Sato for h8300
  fs/minix: Drop dependency on H8300
  Drop remaining references to H8/300 architecture
  Drop MAINTAINERS entry for H8/300
  watchdog: Drop references to H8300 architecture
  net/ethernet: Drop H8/300 Ethernet driver
  net/ethernet: smsc9194: Drop conditional code for H8/300
  ide: Drop H8/300 driver
  Drop support for Renesas H8/300 (h8300) architecture
parents 9b66bfb2 b400126a

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -3152,6 +3152,11 @@ N: Dipankar Sarma 
E: dipankar@in.ibm.com

D: RCU



N: Yoshinori Sato

E: ysato@users.sourceforge.jp

D: uClinux for Renesas H8/300 (H8300)

D: http://uclinux-h8.sourceforge.jp/



N: Hannu Savolainen

E: hannu@opensound.com

D: Maintainer of the sound drivers until 2.1.x days.

Documentation/scheduler/sched-arch.txt

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ Possible arch/ problems 


Possible arch problems I found (and either tried to fix or didn't):



h8300 - Is such sleeping racy vs interrupts? (See #4a).

        The H8/300 manual I found indicates yes, however disabling IRQs

        over the sleep mean only NMIs can wake it up, so can't fix easily

        without doing spin waiting.



ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a)



sh64 - Is sleeping racy vs interrupts? (See #4a)

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -8707,14 +8707,6 @@ S: Maintained 
F:	arch/m68k/*/*_no.*

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



UCLINUX FOR RENESAS H8/300 (H8300)

M:	Yoshinori Sato <ysato@users.sourceforge.jp>

W:	http://uclinux-h8.sourceforge.jp/

S:	Supported

F:	arch/h8300/

F:	drivers/ide/ide-h8300.c

F:	drivers/net/ethernet/8390/ne-h8300.c



UDF FILESYSTEM

M:	Jan Kara <jack@suse.cz>

S:	Maintained

arch/h8300/Kconfig

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
config H8300

	bool

	default y

	select HAVE_IDE

	select GENERIC_ATOMIC64

	select HAVE_UID16

	select VIRT_TO_BUS

	select ARCH_WANT_IPC_PARSE_VERSION

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select HAVE_UNDERSCORE_SYMBOL_PREFIX



config MMU

	bool

	default n



config SWAP

	bool

	default n



config ZONE_DMA

	bool

	default y



config FPU

	bool

	default n



config RWSEM_GENERIC_SPINLOCK

	bool

	default y



config RWSEM_XCHGADD_ALGORITHM

	bool

	default n



config ARCH_HAS_ILOG2_U32

	bool

	default n



config ARCH_HAS_ILOG2_U64

	bool

	default n



config GENERIC_HWEIGHT

	bool

	default y



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_BUG

        bool

        depends on BUG



config TIME_LOW_RES

	bool

	default y



config NO_IOPORT

	def_bool y



config NO_DMA

	def_bool y



config ISA

	bool

	default y



config PCI

	bool

	default n



config HZ

	int

	default 100



source "init/Kconfig"



source "kernel/Kconfig.freezer"



source "arch/h8300/Kconfig.cpu"



menu "Executable file formats"



source "fs/Kconfig.binfmt"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "arch/h8300/Kconfig.ide"



source "fs/Kconfig"



source "arch/h8300/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"

arch/h8300/Kconfig.cpu

deleted100644 → 0
+0 −171
Original line number Diff line number Diff line 
menu "Processor type and features"



choice

	prompt "H8/300 platform"

	default H8300H_GENERIC



config H8300H_GENERIC

	bool "H8/300H Generic"

	help

	  H8/300H CPU Generic Hardware Support



config H8300H_AKI3068NET

	bool "AE-3068/69"

	select H83068

	help

	  AKI-H8/3068F / AKI-H8/3069F Flashmicom LAN Board Support

	  More Information. (Japanese Only)

	  <http://akizukidenshi.com/catalog/default.aspx>

	  AE-3068/69 Evaluation Board Support

	  More Information.

	  <http://www.microtronique.com/ae3069lan.htm>



config H8300H_H8MAX

	bool "H8MAX"

	select H83068

	help

	  H8MAX Evaluation Board Support

	  More Information. (Japanese Only)

	  <http://strawberry-linux.com/h8/index.html>



config H8300H_SIM

	bool "H8/300H Simulator"

	select H83007

	help

	  GDB Simulator Support

	  More Information.

	  <http://sourceware.org/sid/>



config H8S_GENERIC

	bool "H8S Generic"

	help

	  H8S CPU Generic Hardware Support



config H8S_EDOSK2674

	bool "EDOSK-2674"

	select H8S2678

	help

	  Renesas EDOSK-2674 Evaluation Board Support

	  More Information.

	  <http://www.azpower.com/H8-uClinux/index.html>

 	  <http://www.renesas.eu/products/tools/introductory_evaluation_tools/evaluation_development_os_kits/edosk2674r/edosk2674r_software_tools_root.jsp>



config H8S_SIM

	bool "H8S Simulator"

	help

	  GDB Simulator Support

	  More Information.

	  <http://sourceware.org/sid/>



endchoice



choice

	prompt "CPU Selection"



config H83002

	bool "H8/3001,3002,3003"

	depends on BROKEN

	select CPU_H8300H



config H83007

	bool "H8/3006,3007"

	select CPU_H8300H



config H83048

	bool "H8/3044,3045,3046,3047,3048,3052"

	depends on BROKEN

	select CPU_H8300H



config H83068

	bool "H8/3065,3066,3067,3068,3069"

	select CPU_H8300H



config H8S2678

	bool "H8S/2670,2673,2674R,2675,2676"

	select CPU_H8S



endchoice



config CPU_CLOCK

	int "CPU Clock Frequency (/1KHz)"

	default "20000"

	help

	  CPU Clock Frequency divide to 1000



choice

	prompt "Kernel executes from"

	---help---

	  Choose the memory type that the kernel will be running in.



config RAMKERNEL

	bool "RAM"

	help

	  The kernel will be resident in RAM when running.



config ROMKERNEL

	bool "ROM"

	help

	  The kernel will be resident in FLASH/ROM when running.

endchoice





config CPU_H8300H

	bool

	depends on (H83002 || H83007 || H83048 || H83068)

	default y



config CPU_H8S

	bool

	depends on H8S2678

	default y



choice

	prompt "Timer"

config H8300_TIMER8

	bool "8bit timer (2ch cascade)"

	depends on (H83007 || H83068 || H8S2678)



config H8300_TIMER16

	bool "16bit timer"

	depends on (H83007 || H83068)



config H8300_ITU

	bool "ITU"

	depends on (H83002 || H83048)



config H8300_TPU

	bool "TPU"

	depends on H8S2678

endchoice



if H8300_TIMER8

choice

	prompt "Timer Channel"

config H8300_TIMER8_CH0

	bool "Channel 0"

config H8300_TIMER8_CH2

	bool "Channel 2"

	depends on CPU_H8300H

endchoice

endif



config H8300_TIMER16_CH

	int "16bit timer channel (0 - 2)"

	depends on H8300_TIMER16

	range 0 2



config H8300_ITU_CH

	int "ITU channel"

	depends on H8300_ITU

	range 0 4



config H8300_TPU_CH

	int "TPU channel"

	depends on H8300_TPU

	range 0 4



source "kernel/Kconfig.preempt"



source "mm/Kconfig"



endmenu