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

Merge tag 'm68k-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - Introduce virtual m68k machine based on Android Goldfish devices

  - defconfig updates

  - Minor fixes and improvements

* tag 'm68k-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: atari: Make Atari ROM port I/O write macros return void
  m68k: math-emu: Fix dependencies of math emulation support
  m68k: math-emu: Fix typos in comments
  m68k: Wire up syscall_trace_enter/leave for m68k
  m68k: defconfig: Update defconfigs for v5.18-rc1
  m68k: Introduce a virtual m68k machine
  clocksource/drivers: Add a goldfish-timer clocksource
  rtc: goldfish: Use gf_ioread32()/gf_iowrite32()
  tty: goldfish: Introduce gf_ioread32()/gf_iowrite32()
parents 17a05c8f 30b5e6ef

arch/m68k/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ obj-$(CONFIG_M68060) += ifpsp060/ 
obj-$(CONFIG_M68KFPU_EMU)	+= math-emu/

obj-$(CONFIG_M68000)		+= 68000/

obj-$(CONFIG_COLDFIRE)		+= coldfire/

obj-$(CONFIG_VIRT)		+= virt/

arch/m68k/Kconfig.cpu

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ comment "Processor Specific Options" 


config M68KFPU_EMU

	bool "Math emulation support"

	depends on MMU

	depends on M68KCLASSIC && FPU

	help

	  At some point in the future, this will cause floating-point math

	  instructions to be emulated by the kernel on machines that lack a

arch/m68k/Kconfig.machine

+17 −0
Original line number Diff line number Diff line
@@ -149,6 +149,23 @@ config SUN3 


	  If you don't want to compile a kernel exclusively for a Sun 3, say N.



config VIRT

	bool "Virtual M68k Machine support"

	depends on MMU

	select GENERIC_CLOCKEVENTS

	select GOLDFISH

	select GOLDFISH_TIMER

	select GOLDFISH_TTY

	select M68040

	select MMU_MOTOROLA if MMU

	select RTC_CLASS

	select RTC_DRV_GOLDFISH

	select TTY

	select VIRTIO_MMIO

	help

	  This options enable a pure virtual machine based on m68k,

	  VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC)



config PILOT

	bool

arch/m68k/configs/amiga_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -581,6 +580,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -613,7 +613,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -638,7 +637,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -659,6 +657,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

arch/m68k/configs/apollo_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -538,6 +537,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -570,7 +570,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m 
# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -594,7 +593,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -615,6 +613,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m