Skip to content

Commit fdd8f65

Browse files
torvaldstorvalds
committed
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()
2 parents 17a05c8 + 30b5e6e commit fdd8f65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+844
-120
lines changed

‎arch/m68k/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ obj-$(CONFIG_M68060) += ifpsp060/
1717
obj-$(CONFIG_M68KFPU_EMU) += math-emu/
1818
obj-$(CONFIG_M68000) += 68000/
1919
obj-$(CONFIG_COLDFIRE) += coldfire/
20+
obj-$(CONFIG_VIRT) += virt/

‎arch/m68k/Kconfig.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ comment "Processor Specific Options"
327327

328328
config M68KFPU_EMU
329329
bool "Math emulation support"
330-
depends on MMU
330+
depends on M68KCLASSIC && FPU
331331
help
332332
At some point in the future, this will cause floating-point math
333333
instructions to be emulated by the kernel on machines that lack a

‎arch/m68k/Kconfig.machine

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,23 @@ config SUN3
149149

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

152+
config VIRT
153+
bool "Virtual M68k Machine support"
154+
depends on MMU
155+
select GENERIC_CLOCKEVENTS
156+
select GOLDFISH
157+
select GOLDFISH_TIMER
158+
select GOLDFISH_TTY
159+
select M68040
160+
select MMU_MOTOROLA if MMU
161+
select RTC_CLASS
162+
select RTC_DRV_GOLDFISH
163+
select TTY
164+
select VIRTIO_MMIO
165+
help
166+
This options enable a pure virtual machine based on m68k,
167+
VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC)
168+
152169
config PILOT
153170
bool
154171

‎arch/m68k/configs/amiga_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
4242
CONFIG_MQ_IOSCHED_KYBER=m
4343
CONFIG_IOSCHED_BFQ=m
4444
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
45-
CONFIG_BINFMT_AOUT=m
4645
CONFIG_BINFMT_MISC=m
4746
# CONFIG_COMPACTION is not set
4847
CONFIG_ZPOOL=m
@@ -581,6 +580,7 @@ CONFIG_CRYPTO_MD4=m
581580
CONFIG_CRYPTO_MICHAEL_MIC=m
582581
CONFIG_CRYPTO_RMD160=m
583582
CONFIG_CRYPTO_SHA3=m
583+
CONFIG_CRYPTO_SM3=m
584584
CONFIG_CRYPTO_WP512=m
585585
CONFIG_CRYPTO_AES=y
586586
CONFIG_CRYPTO_AES_TI=m
@@ -613,7 +613,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
613613
# CONFIG_CRYPTO_HW is not set
614614
CONFIG_PRIME_NUMBERS=m
615615
CONFIG_CRC32_SELFTEST=m
616-
CONFIG_CRC64=m
617616
CONFIG_XZ_DEC_TEST=m
618617
CONFIG_GLOB_SELFTEST=m
619618
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -638,7 +637,6 @@ CONFIG_TEST_SCANF=m
638637
CONFIG_TEST_BITMAP=m
639638
CONFIG_TEST_UUID=m
640639
CONFIG_TEST_XARRAY=m
641-
CONFIG_TEST_OVERFLOW=m
642640
CONFIG_TEST_RHASHTABLE=m
643641
CONFIG_TEST_SIPHASH=m
644642
CONFIG_TEST_IDA=m
@@ -659,6 +657,5 @@ CONFIG_TEST_UDELAY=m
659657
CONFIG_TEST_STATIC_KEYS=m
660658
CONFIG_TEST_KMOD=m
661659
CONFIG_TEST_MEMCAT_P=m
662-
CONFIG_TEST_STACKINIT=m
663660
CONFIG_TEST_MEMINIT=m
664661
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
3838
CONFIG_MQ_IOSCHED_KYBER=m
3939
CONFIG_IOSCHED_BFQ=m
4040
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
41-
CONFIG_BINFMT_AOUT=m
4241
CONFIG_BINFMT_MISC=m
4342
# CONFIG_COMPACTION is not set
4443
CONFIG_ZPOOL=m
@@ -538,6 +537,7 @@ CONFIG_CRYPTO_MD4=m
538537
CONFIG_CRYPTO_MICHAEL_MIC=m
539538
CONFIG_CRYPTO_RMD160=m
540539
CONFIG_CRYPTO_SHA3=m
540+
CONFIG_CRYPTO_SM3=m
541541
CONFIG_CRYPTO_WP512=m
542542
CONFIG_CRYPTO_AES=y
543543
CONFIG_CRYPTO_AES_TI=m
@@ -570,7 +570,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
570570
# CONFIG_CRYPTO_HW is not set
571571
CONFIG_PRIME_NUMBERS=m
572572
CONFIG_CRC32_SELFTEST=m
573-
CONFIG_CRC64=m
574573
CONFIG_XZ_DEC_TEST=m
575574
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
576575
CONFIG_MAGIC_SYSRQ=y
@@ -594,7 +593,6 @@ CONFIG_TEST_SCANF=m
594593
CONFIG_TEST_BITMAP=m
595594
CONFIG_TEST_UUID=m
596595
CONFIG_TEST_XARRAY=m
597-
CONFIG_TEST_OVERFLOW=m
598596
CONFIG_TEST_RHASHTABLE=m
599597
CONFIG_TEST_SIPHASH=m
600598
CONFIG_TEST_IDA=m
@@ -615,6 +613,5 @@ CONFIG_TEST_UDELAY=m
615613
CONFIG_TEST_STATIC_KEYS=m
616614
CONFIG_TEST_KMOD=m
617615
CONFIG_TEST_MEMCAT_P=m
618-
CONFIG_TEST_STACKINIT=m
619616
CONFIG_TEST_MEMINIT=m
620617
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
4545
CONFIG_MQ_IOSCHED_KYBER=m
4646
CONFIG_IOSCHED_BFQ=m
4747
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
48-
CONFIG_BINFMT_AOUT=m
4948
CONFIG_BINFMT_MISC=m
5049
# CONFIG_COMPACTION is not set
5150
CONFIG_ZPOOL=m
@@ -558,6 +557,7 @@ CONFIG_CRYPTO_MD4=m
558557
CONFIG_CRYPTO_MICHAEL_MIC=m
559558
CONFIG_CRYPTO_RMD160=m
560559
CONFIG_CRYPTO_SHA3=m
560+
CONFIG_CRYPTO_SM3=m
561561
CONFIG_CRYPTO_WP512=m
562562
CONFIG_CRYPTO_AES=y
563563
CONFIG_CRYPTO_AES_TI=m
@@ -590,7 +590,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
590590
# CONFIG_CRYPTO_HW is not set
591591
CONFIG_PRIME_NUMBERS=m
592592
CONFIG_CRC32_SELFTEST=m
593-
CONFIG_CRC64=m
594593
CONFIG_XZ_DEC_TEST=m
595594
CONFIG_GLOB_SELFTEST=m
596595
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -615,7 +614,6 @@ CONFIG_TEST_SCANF=m
615614
CONFIG_TEST_BITMAP=m
616615
CONFIG_TEST_UUID=m
617616
CONFIG_TEST_XARRAY=m
618-
CONFIG_TEST_OVERFLOW=m
619617
CONFIG_TEST_RHASHTABLE=m
620618
CONFIG_TEST_SIPHASH=m
621619
CONFIG_TEST_IDA=m
@@ -636,6 +634,5 @@ CONFIG_TEST_UDELAY=m
636634
CONFIG_TEST_STATIC_KEYS=m
637635
CONFIG_TEST_KMOD=m
638636
CONFIG_TEST_MEMCAT_P=m
639-
CONFIG_TEST_STACKINIT=m
640637
CONFIG_TEST_MEMINIT=m
641638
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
3535
CONFIG_MQ_IOSCHED_KYBER=m
3636
CONFIG_IOSCHED_BFQ=m
3737
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
38-
CONFIG_BINFMT_AOUT=m
3938
CONFIG_BINFMT_MISC=m
4039
# CONFIG_COMPACTION is not set
4140
CONFIG_ZPOOL=m
@@ -530,6 +529,7 @@ CONFIG_CRYPTO_MD4=m
530529
CONFIG_CRYPTO_MICHAEL_MIC=m
531530
CONFIG_CRYPTO_RMD160=m
532531
CONFIG_CRYPTO_SHA3=m
532+
CONFIG_CRYPTO_SM3=m
533533
CONFIG_CRYPTO_WP512=m
534534
CONFIG_CRYPTO_AES=y
535535
CONFIG_CRYPTO_AES_TI=m
@@ -562,7 +562,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
562562
# CONFIG_CRYPTO_HW is not set
563563
CONFIG_PRIME_NUMBERS=m
564564
CONFIG_CRC32_SELFTEST=m
565-
CONFIG_CRC64=m
566565
CONFIG_XZ_DEC_TEST=m
567566
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
568567
CONFIG_MAGIC_SYSRQ=y
@@ -586,7 +585,6 @@ CONFIG_TEST_SCANF=m
586585
CONFIG_TEST_BITMAP=m
587586
CONFIG_TEST_UUID=m
588587
CONFIG_TEST_XARRAY=m
589-
CONFIG_TEST_OVERFLOW=m
590588
CONFIG_TEST_RHASHTABLE=m
591589
CONFIG_TEST_SIPHASH=m
592590
CONFIG_TEST_IDA=m
@@ -607,6 +605,5 @@ CONFIG_TEST_UDELAY=m
607605
CONFIG_TEST_STATIC_KEYS=m
608606
CONFIG_TEST_KMOD=m
609607
CONFIG_TEST_MEMCAT_P=m
610-
CONFIG_TEST_STACKINIT=m
611608
CONFIG_TEST_MEMINIT=m
612609
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
3737
CONFIG_MQ_IOSCHED_KYBER=m
3838
CONFIG_IOSCHED_BFQ=m
3939
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40-
CONFIG_BINFMT_AOUT=m
4140
CONFIG_BINFMT_MISC=m
4241
# CONFIG_COMPACTION is not set
4342
CONFIG_ZPOOL=m
@@ -540,6 +539,7 @@ CONFIG_CRYPTO_MD4=m
540539
CONFIG_CRYPTO_MICHAEL_MIC=m
541540
CONFIG_CRYPTO_RMD160=m
542541
CONFIG_CRYPTO_SHA3=m
542+
CONFIG_CRYPTO_SM3=m
543543
CONFIG_CRYPTO_WP512=m
544544
CONFIG_CRYPTO_AES=y
545545
CONFIG_CRYPTO_AES_TI=m
@@ -572,7 +572,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
572572
# CONFIG_CRYPTO_HW is not set
573573
CONFIG_PRIME_NUMBERS=m
574574
CONFIG_CRC32_SELFTEST=m
575-
CONFIG_CRC64=m
576575
CONFIG_XZ_DEC_TEST=m
577576
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
578577
CONFIG_MAGIC_SYSRQ=y
@@ -596,7 +595,6 @@ CONFIG_TEST_SCANF=m
596595
CONFIG_TEST_BITMAP=m
597596
CONFIG_TEST_UUID=m
598597
CONFIG_TEST_XARRAY=m
599-
CONFIG_TEST_OVERFLOW=m
600598
CONFIG_TEST_RHASHTABLE=m
601599
CONFIG_TEST_SIPHASH=m
602600
CONFIG_TEST_IDA=m
@@ -617,6 +615,5 @@ CONFIG_TEST_UDELAY=m
617615
CONFIG_TEST_STATIC_KEYS=m
618616
CONFIG_TEST_KMOD=m
619617
CONFIG_TEST_MEMCAT_P=m
620-
CONFIG_TEST_STACKINIT=m
621618
CONFIG_TEST_MEMINIT=m
622619
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
3636
CONFIG_MQ_IOSCHED_KYBER=m
3737
CONFIG_IOSCHED_BFQ=m
3838
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
39-
CONFIG_BINFMT_AOUT=m
4039
CONFIG_BINFMT_MISC=m
4140
# CONFIG_COMPACTION is not set
4241
CONFIG_ZPOOL=m
@@ -560,6 +559,7 @@ CONFIG_CRYPTO_MD4=m
560559
CONFIG_CRYPTO_MICHAEL_MIC=m
561560
CONFIG_CRYPTO_RMD160=m
562561
CONFIG_CRYPTO_SHA3=m
562+
CONFIG_CRYPTO_SM3=m
563563
CONFIG_CRYPTO_WP512=m
564564
CONFIG_CRYPTO_AES=y
565565
CONFIG_CRYPTO_AES_TI=m
@@ -592,7 +592,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
592592
# CONFIG_CRYPTO_HW is not set
593593
CONFIG_PRIME_NUMBERS=m
594594
CONFIG_CRC32_SELFTEST=m
595-
CONFIG_CRC64=m
596595
CONFIG_XZ_DEC_TEST=m
597596
CONFIG_GLOB_SELFTEST=m
598597
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -617,7 +616,6 @@ CONFIG_TEST_SCANF=m
617616
CONFIG_TEST_BITMAP=m
618617
CONFIG_TEST_UUID=m
619618
CONFIG_TEST_XARRAY=m
620-
CONFIG_TEST_OVERFLOW=m
621619
CONFIG_TEST_RHASHTABLE=m
622620
CONFIG_TEST_SIPHASH=m
623621
CONFIG_TEST_IDA=m
@@ -638,6 +636,5 @@ CONFIG_TEST_UDELAY=m
638636
CONFIG_TEST_STATIC_KEYS=m
639637
CONFIG_TEST_KMOD=m
640638
CONFIG_TEST_MEMCAT_P=m
641-
CONFIG_TEST_STACKINIT=m
642639
CONFIG_TEST_MEMINIT=m
643640
CONFIG_TEST_FREE_PAGES=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
5656
CONFIG_MQ_IOSCHED_KYBER=m
5757
CONFIG_IOSCHED_BFQ=m
5858
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
59-
CONFIG_BINFMT_AOUT=m
6059
CONFIG_BINFMT_MISC=m
6160
# CONFIG_COMPACTION is not set
6261
CONFIG_ZPOOL=m
@@ -646,6 +645,7 @@ CONFIG_CRYPTO_MD4=m
646645
CONFIG_CRYPTO_MICHAEL_MIC=m
647646
CONFIG_CRYPTO_RMD160=m
648647
CONFIG_CRYPTO_SHA3=m
648+
CONFIG_CRYPTO_SM3=m
649649
CONFIG_CRYPTO_WP512=m
650650
CONFIG_CRYPTO_AES=y
651651
CONFIG_CRYPTO_AES_TI=m
@@ -678,7 +678,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
678678
# CONFIG_CRYPTO_HW is not set
679679
CONFIG_PRIME_NUMBERS=m
680680
CONFIG_CRC32_SELFTEST=m
681-
CONFIG_CRC64=m
682681
CONFIG_XZ_DEC_TEST=m
683682
CONFIG_GLOB_SELFTEST=m
684683
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -703,7 +702,6 @@ CONFIG_TEST_SCANF=m
703702
CONFIG_TEST_BITMAP=m
704703
CONFIG_TEST_UUID=m
705704
CONFIG_TEST_XARRAY=m
706-
CONFIG_TEST_OVERFLOW=m
707705
CONFIG_TEST_RHASHTABLE=m
708706
CONFIG_TEST_SIPHASH=m
709707
CONFIG_TEST_IDA=m
@@ -724,6 +722,5 @@ CONFIG_TEST_UDELAY=m
724722
CONFIG_TEST_STATIC_KEYS=m
725723
CONFIG_TEST_KMOD=m
726724
CONFIG_TEST_MEMCAT_P=m
727-
CONFIG_TEST_STACKINIT=m
728725
CONFIG_TEST_MEMINIT=m
729726
CONFIG_TEST_FREE_PAGES=m

0 commit comments

Comments
 (0)