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

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

Pull m68k updates from Geert Uytterhoeven:

 - Use RNG seed from bootinfo block on virt platform

 - defconfig updates

 - Minor fixes and improvements

* tag 'm68k-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v5.19-rc1
  m68k: Add common forward declaration for show_registers()
  m68k: mac: Remove forward declaration for mac_nmi_handler()
  m68k: virt: Fix missing platform_device_unregister() on error in virt_platform_init()
  m68k: virt: Use RNG seed from bootinfo block
  m68k: bitops: Change __fls to return and accept unsigned long
  m68k: Kconfig.machine: Add endif comment
  m68k: Kconfig.debug: Replace single quotes
  m68k: Kconfig.cpu: Fix indentation and add endif comments
  m68k: q40: Align '*' in comments
  m68k: sun3: Use __func__ to get function's name in an output message
  m68k: mac: Fix typos in comments
  m68k: virt: Kconfig minor fixes
parents 60ee49fa b508128b

arch/m68k/Kconfig.cpu

+3 −4
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ config COLDFIRE_SLTIMERS 


endif # COLDFIRE





comment "Processor Specific Options"



config M68KFPU_EMU
@@ -522,7 +521,7 @@ config CACHE_BOTH 
	  Split the ColdFire CPU cache, and use half as an instruction cache

	  and half as a data cache.

endchoice

endif

endif # HAVE_CACHE_SPLIT



if HAVE_CACHE_CB

choice
@@ -539,4 +538,4 @@ config CACHE_COPYBACK 
	help

	  The ColdFire CPU cache is set into Copy-back mode.

endchoice

endif
 
endif # HAVE_CACHE_CB

arch/m68k/Kconfig.debug

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



config BOOTPARAM

	bool 'Compiled-in Kernel Boot Parameter'

	bool "Compiled-in Kernel Boot Parameter"



config BOOTPARAM_STRING

	string 'Kernel Boot Parameter'

	default 'console=ttyS0,19200'

	string "Kernel Boot Parameter"

	default "console=ttyS0,19200"

	depends on BOOTPARAM



config EARLY_PRINTK

arch/m68k/Kconfig.machine

+3 −2
Original line number Diff line number Diff line
@@ -161,10 +161,11 @@ config VIRT 
	select RTC_CLASS

	select RTC_DRV_GOLDFISH

	select TTY

	select VIRTIO_MENU

	select VIRTIO_MMIO

	help

	  This options enable a pure virtual machine based on m68k,

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

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



config PILOT

	bool
@@ -492,4 +493,4 @@ config ROMKERNEL 


endchoice



endif
 
endif # !MMU || COLDFIRE

arch/m68k/configs/amiga_defconfig

+5 −9
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -43,8 +41,9 @@ CONFIG_MQ_IOSCHED_KYBER=m 
CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -310,6 +309,7 @@ CONFIG_PARPORT_MFC3=m 
CONFIG_PARPORT_1284=y

CONFIG_AMIGA_FLOPPY=y

CONFIG_AMIGA_Z2RAM=y

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m
@@ -580,7 +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_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -595,7 +595,7 @@ CONFIG_CRYPTO_FCRYPT=m 
CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m
@@ -648,11 +648,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m 
CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/apollo_defconfig

+5 −9
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -39,8 +37,9 @@ CONFIG_MQ_IOSCHED_KYBER=m 
CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -300,6 +299,7 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_CONNECTOR=m

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m
@@ -537,7 +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_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -552,7 +552,7 @@ CONFIG_CRYPTO_FCRYPT=m 
CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m
@@ -604,11 +604,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m 
CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m