Skip to content

Commit 8c4e1c0

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v5.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - several Kbuild improvements - several Mac fixes - minor cleanups and fixes - defconfig updates * tag 'm68k-for-v5.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v5.8-rc3 m68k: Use CLEAN_FILES to clean up files m68k: mac: Improve IOP debug messages m68k: mac: Don't send uninitialized data in IOP message reply m68k: mac: Fix IOP status/control register writes m68k: mac: Don't send IOP message until channel is idle m68k: atari: Annotate dummy read in ROM port IO code as __maybe_unused m68k: Use sizeof_field() helper m68k: Pass -D options to KBUILD_CPPFLAGS instead of KBUILD_{A,C}FLAGS m68k: Optimize cc-option calls for cpuflags-y m68k: sun3: Descend to prom from arch/m68k/sun3 m68k: Add arch/m68k/Kbuild
2 parents 0511921 + 382f429 commit 8c4e1c0

18 files changed

+129
-99
lines changed

‎arch/m68k/Kbuild

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
obj-y += kernel/ mm/
3+
obj-$(CONFIG_Q40) += q40/
4+
obj-$(CONFIG_AMIGA) += amiga/
5+
obj-$(CONFIG_ATARI) += atari/
6+
obj-$(CONFIG_MAC) += mac/
7+
obj-$(CONFIG_HP300) += hp300/
8+
obj-$(CONFIG_APOLLO) += apollo/
9+
obj-$(CONFIG_MVME147) += mvme147/
10+
obj-$(CONFIG_MVME16x) += mvme16x/
11+
obj-$(CONFIG_BVME6000) += bvme6000/
12+
obj-$(CONFIG_SUN3X) += sun3x/ sun3/
13+
obj-$(CONFIG_SUN3) += sun3/
14+
obj-$(CONFIG_NATFEAT) += emu/
15+
obj-$(CONFIG_M68040) += fpsp040/
16+
obj-$(CONFIG_M68060) += ifpsp060/
17+
obj-$(CONFIG_M68KFPU_EMU) += math-emu/
18+
obj-$(CONFIG_M68000) += 68000/
19+
obj-$(CONFIG_COLDFIRE) += coldfire/

‎arch/m68k/Makefile

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,33 @@ endif
3232
# compiler cpu type flag.
3333
#
3434
ifndef CONFIG_M68040
35-
cpuflags-$(CONFIG_M68060) := -m68060
35+
cpuflags-$(CONFIG_M68060) = -m68060
3636
endif
3737
ifndef CONFIG_M68060
38-
cpuflags-$(CONFIG_M68040) := -m68040
38+
cpuflags-$(CONFIG_M68040) = -m68040
3939
endif
40-
cpuflags-$(CONFIG_M68030) :=
41-
cpuflags-$(CONFIG_M68020) :=
42-
cpuflags-$(CONFIG_M68000) := -m68000
43-
cpuflags-$(CONFIG_M5441x) := $(call cc-option,-mcpu=54455,-mcfv4e)
44-
cpuflags-$(CONFIG_M54xx) := $(call cc-option,-mcpu=5475,-m5200)
45-
cpuflags-$(CONFIG_M5407) := $(call cc-option,-mcpu=5407,-m5200)
46-
cpuflags-$(CONFIG_M532x) := $(call cc-option,-mcpu=532x,-m5307)
47-
cpuflags-$(CONFIG_M537x) := $(call cc-option,-mcpu=537x,-m5307)
48-
cpuflags-$(CONFIG_M5307) := $(call cc-option,-mcpu=5307,-m5200)
49-
cpuflags-$(CONFIG_M528x) := $(call cc-option,-mcpu=528x,-m5307)
50-
cpuflags-$(CONFIG_M5275) := $(call cc-option,-mcpu=5275,-m5307)
51-
cpuflags-$(CONFIG_M5272) := $(call cc-option,-mcpu=5272,-m5307)
52-
cpuflags-$(CONFIG_M5271) := $(call cc-option,-mcpu=5271,-m5307)
53-
cpuflags-$(CONFIG_M523x) := $(call cc-option,-mcpu=523x,-m5307)
54-
cpuflags-$(CONFIG_M525x) := $(call cc-option,-mcpu=5253,-m5200)
55-
cpuflags-$(CONFIG_M5249) := $(call cc-option,-mcpu=5249,-m5200)
56-
cpuflags-$(CONFIG_M520x) := $(call cc-option,-mcpu=5208,-m5200)
57-
cpuflags-$(CONFIG_M5206e) := $(call cc-option,-mcpu=5206e,-m5200)
58-
cpuflags-$(CONFIG_M5206) := $(call cc-option,-mcpu=5206,-m5200)
40+
cpuflags-$(CONFIG_M68030) =
41+
cpuflags-$(CONFIG_M68020) =
42+
cpuflags-$(CONFIG_M68000) = -m68000
43+
cpuflags-$(CONFIG_M5441x) = $(call cc-option,-mcpu=54455,-mcfv4e)
44+
cpuflags-$(CONFIG_M54xx) = $(call cc-option,-mcpu=5475,-m5200)
45+
cpuflags-$(CONFIG_M5407) = $(call cc-option,-mcpu=5407,-m5200)
46+
cpuflags-$(CONFIG_M532x) = $(call cc-option,-mcpu=532x,-m5307)
47+
cpuflags-$(CONFIG_M537x) = $(call cc-option,-mcpu=537x,-m5307)
48+
cpuflags-$(CONFIG_M5307) = $(call cc-option,-mcpu=5307,-m5200)
49+
cpuflags-$(CONFIG_M528x) = $(call cc-option,-mcpu=528x,-m5307)
50+
cpuflags-$(CONFIG_M5275) = $(call cc-option,-mcpu=5275,-m5307)
51+
cpuflags-$(CONFIG_M5272) = $(call cc-option,-mcpu=5272,-m5307)
52+
cpuflags-$(CONFIG_M5271) = $(call cc-option,-mcpu=5271,-m5307)
53+
cpuflags-$(CONFIG_M523x) = $(call cc-option,-mcpu=523x,-m5307)
54+
cpuflags-$(CONFIG_M525x) = $(call cc-option,-mcpu=5253,-m5200)
55+
cpuflags-$(CONFIG_M5249) = $(call cc-option,-mcpu=5249,-m5200)
56+
cpuflags-$(CONFIG_M520x) = $(call cc-option,-mcpu=5208,-m5200)
57+
cpuflags-$(CONFIG_M5206e) = $(call cc-option,-mcpu=5206e,-m5200)
58+
cpuflags-$(CONFIG_M5206) = $(call cc-option,-mcpu=5206,-m5200)
59+
60+
# Evaluate tune cc-option calls now
61+
cpuflags-y := $(cpuflags-y)
5962

6063
KBUILD_AFLAGS += $(cpuflags-y)
6164
KBUILD_CFLAGS += $(cpuflags-y)
@@ -67,9 +70,8 @@ ifdef CONFIG_MMU
6770
KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2
6871
else
6972
# we can use a m68k-linux-gcc toolchain with these in place
70-
KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
71-
KBUILD_CFLAGS += -D__uClinux__
72-
KBUILD_AFLAGS += -D__uClinux__
73+
KBUILD_CPPFLAGS += -DUTS_SYSNAME=\"uClinux\"
74+
KBUILD_CPPFLAGS += -D__uClinux__
7375
endif
7476

7577
KBUILD_LDFLAGS := -m m68kelf
@@ -97,27 +99,9 @@ head-$(CONFIG_SUN3) := arch/m68k/kernel/sun3-head.o
9799
head-$(CONFIG_M68000) := arch/m68k/68000/head.o
98100
head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o
99101

100-
core-y += arch/m68k/kernel/ arch/m68k/mm/
102+
core-y += arch/m68k/
101103
libs-y += arch/m68k/lib/
102104

103-
core-$(CONFIG_Q40) += arch/m68k/q40/
104-
core-$(CONFIG_AMIGA) += arch/m68k/amiga/
105-
core-$(CONFIG_ATARI) += arch/m68k/atari/
106-
core-$(CONFIG_MAC) += arch/m68k/mac/
107-
core-$(CONFIG_HP300) += arch/m68k/hp300/
108-
core-$(CONFIG_APOLLO) += arch/m68k/apollo/
109-
core-$(CONFIG_MVME147) += arch/m68k/mvme147/
110-
core-$(CONFIG_MVME16x) += arch/m68k/mvme16x/
111-
core-$(CONFIG_BVME6000) += arch/m68k/bvme6000/
112-
core-$(CONFIG_SUN3X) += arch/m68k/sun3x/ arch/m68k/sun3/
113-
core-$(CONFIG_SUN3) += arch/m68k/sun3/ arch/m68k/sun3/prom/
114-
core-$(CONFIG_NATFEAT) += arch/m68k/emu/
115-
core-$(CONFIG_M68040) += arch/m68k/fpsp040/
116-
core-$(CONFIG_M68060) += arch/m68k/ifpsp060/
117-
core-$(CONFIG_M68KFPU_EMU) += arch/m68k/math-emu/
118-
core-$(CONFIG_M68000) += arch/m68k/68000/
119-
core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/
120-
121105

122106
all: zImage
123107

@@ -154,8 +138,7 @@ else
154138
$(KBZIP2) -1c vmlinux >vmlinux.bz2
155139
endif
156140

157-
archclean:
158-
rm -f vmlinux.gz vmlinux.bz2
141+
CLEAN_FILES += vmlinux.gz vmlinux.bz2
159142

160143
archheaders:
161144
$(Q)$(MAKE) $(build)=arch/m68k/kernel/syscalls all

‎arch/m68k/configs/amiga_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ CONFIG_CRYPTO_BLOWFISH=m
594594
CONFIG_CRYPTO_CAMELLIA=m
595595
CONFIG_CRYPTO_CAST5=m
596596
CONFIG_CRYPTO_CAST6=m
597+
CONFIG_CRYPTO_DES=m
597598
CONFIG_CRYPTO_FCRYPT=m
598599
CONFIG_CRYPTO_KHAZAD=m
599600
CONFIG_CRYPTO_SALSA20=m
@@ -615,6 +616,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
615616
CONFIG_CRYPTO_USER_API_RNG=m
616617
CONFIG_CRYPTO_USER_API_AEAD=m
617618
# CONFIG_CRYPTO_HW is not set
619+
CONFIG_PRIME_NUMBERS=m
618620
CONFIG_CRC32_SELFTEST=m
619621
CONFIG_CRC64=m
620622
CONFIG_XZ_DEC_TEST=m
@@ -643,6 +645,7 @@ CONFIG_TEST_OVERFLOW=m
643645
CONFIG_TEST_RHASHTABLE=m
644646
CONFIG_TEST_HASH=m
645647
CONFIG_TEST_IDA=m
648+
CONFIG_TEST_BITOPS=m
646649
CONFIG_TEST_VMALLOC=m
647650
CONFIG_TEST_USER_COPY=m
648651
CONFIG_TEST_BPF=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ CONFIG_CRYPTO_BLOWFISH=m
550550
CONFIG_CRYPTO_CAMELLIA=m
551551
CONFIG_CRYPTO_CAST5=m
552552
CONFIG_CRYPTO_CAST6=m
553+
CONFIG_CRYPTO_DES=m
553554
CONFIG_CRYPTO_FCRYPT=m
554555
CONFIG_CRYPTO_KHAZAD=m
555556
CONFIG_CRYPTO_SALSA20=m
@@ -571,6 +572,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
571572
CONFIG_CRYPTO_USER_API_RNG=m
572573
CONFIG_CRYPTO_USER_API_AEAD=m
573574
# CONFIG_CRYPTO_HW is not set
575+
CONFIG_PRIME_NUMBERS=m
574576
CONFIG_CRC32_SELFTEST=m
575577
CONFIG_CRC64=m
576578
CONFIG_XZ_DEC_TEST=m
@@ -599,6 +601,7 @@ CONFIG_TEST_OVERFLOW=m
599601
CONFIG_TEST_RHASHTABLE=m
600602
CONFIG_TEST_HASH=m
601603
CONFIG_TEST_IDA=m
604+
CONFIG_TEST_BITOPS=m
602605
CONFIG_TEST_VMALLOC=m
603606
CONFIG_TEST_USER_COPY=m
604607
CONFIG_TEST_BPF=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ CONFIG_CRYPTO_BLOWFISH=m
572572
CONFIG_CRYPTO_CAMELLIA=m
573573
CONFIG_CRYPTO_CAST5=m
574574
CONFIG_CRYPTO_CAST6=m
575+
CONFIG_CRYPTO_DES=m
575576
CONFIG_CRYPTO_FCRYPT=m
576577
CONFIG_CRYPTO_KHAZAD=m
577578
CONFIG_CRYPTO_SALSA20=m
@@ -593,6 +594,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
593594
CONFIG_CRYPTO_USER_API_RNG=m
594595
CONFIG_CRYPTO_USER_API_AEAD=m
595596
# CONFIG_CRYPTO_HW is not set
597+
CONFIG_PRIME_NUMBERS=m
596598
CONFIG_CRC32_SELFTEST=m
597599
CONFIG_CRC64=m
598600
CONFIG_XZ_DEC_TEST=m
@@ -621,6 +623,7 @@ CONFIG_TEST_OVERFLOW=m
621623
CONFIG_TEST_RHASHTABLE=m
622624
CONFIG_TEST_HASH=m
623625
CONFIG_TEST_IDA=m
626+
CONFIG_TEST_BITOPS=m
624627
CONFIG_TEST_VMALLOC=m
625628
CONFIG_TEST_USER_COPY=m
626629
CONFIG_TEST_BPF=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ CONFIG_CRYPTO_BLOWFISH=m
543543
CONFIG_CRYPTO_CAMELLIA=m
544544
CONFIG_CRYPTO_CAST5=m
545545
CONFIG_CRYPTO_CAST6=m
546+
CONFIG_CRYPTO_DES=m
546547
CONFIG_CRYPTO_FCRYPT=m
547548
CONFIG_CRYPTO_KHAZAD=m
548549
CONFIG_CRYPTO_SALSA20=m
@@ -564,6 +565,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
564565
CONFIG_CRYPTO_USER_API_RNG=m
565566
CONFIG_CRYPTO_USER_API_AEAD=m
566567
# CONFIG_CRYPTO_HW is not set
568+
CONFIG_PRIME_NUMBERS=m
567569
CONFIG_CRC32_SELFTEST=m
568570
CONFIG_CRC64=m
569571
CONFIG_XZ_DEC_TEST=m
@@ -592,6 +594,7 @@ CONFIG_TEST_OVERFLOW=m
592594
CONFIG_TEST_RHASHTABLE=m
593595
CONFIG_TEST_HASH=m
594596
CONFIG_TEST_IDA=m
597+
CONFIG_TEST_BITOPS=m
595598
CONFIG_TEST_VMALLOC=m
596599
CONFIG_TEST_USER_COPY=m
597600
CONFIG_TEST_BPF=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ CONFIG_CRYPTO_BLOWFISH=m
552552
CONFIG_CRYPTO_CAMELLIA=m
553553
CONFIG_CRYPTO_CAST5=m
554554
CONFIG_CRYPTO_CAST6=m
555+
CONFIG_CRYPTO_DES=m
555556
CONFIG_CRYPTO_FCRYPT=m
556557
CONFIG_CRYPTO_KHAZAD=m
557558
CONFIG_CRYPTO_SALSA20=m
@@ -573,6 +574,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
573574
CONFIG_CRYPTO_USER_API_RNG=m
574575
CONFIG_CRYPTO_USER_API_AEAD=m
575576
# CONFIG_CRYPTO_HW is not set
577+
CONFIG_PRIME_NUMBERS=m
576578
CONFIG_CRC32_SELFTEST=m
577579
CONFIG_CRC64=m
578580
CONFIG_XZ_DEC_TEST=m
@@ -601,6 +603,7 @@ CONFIG_TEST_OVERFLOW=m
601603
CONFIG_TEST_RHASHTABLE=m
602604
CONFIG_TEST_HASH=m
603605
CONFIG_TEST_IDA=m
606+
CONFIG_TEST_BITOPS=m
604607
CONFIG_TEST_VMALLOC=m
605608
CONFIG_TEST_USER_COPY=m
606609
CONFIG_TEST_BPF=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ CONFIG_CRYPTO_BLOWFISH=m
574574
CONFIG_CRYPTO_CAMELLIA=m
575575
CONFIG_CRYPTO_CAST5=m
576576
CONFIG_CRYPTO_CAST6=m
577+
CONFIG_CRYPTO_DES=m
577578
CONFIG_CRYPTO_FCRYPT=m
578579
CONFIG_CRYPTO_KHAZAD=m
579580
CONFIG_CRYPTO_SALSA20=m
@@ -595,6 +596,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
595596
CONFIG_CRYPTO_USER_API_RNG=m
596597
CONFIG_CRYPTO_USER_API_AEAD=m
597598
# CONFIG_CRYPTO_HW is not set
599+
CONFIG_PRIME_NUMBERS=m
598600
CONFIG_CRC32_SELFTEST=m
599601
CONFIG_CRC64=m
600602
CONFIG_XZ_DEC_TEST=m
@@ -623,6 +625,7 @@ CONFIG_TEST_OVERFLOW=m
623625
CONFIG_TEST_RHASHTABLE=m
624626
CONFIG_TEST_HASH=m
625627
CONFIG_TEST_IDA=m
628+
CONFIG_TEST_BITOPS=m
626629
CONFIG_TEST_VMALLOC=m
627630
CONFIG_TEST_USER_COPY=m
628631
CONFIG_TEST_BPF=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ CONFIG_CRYPTO_BLOWFISH=m
660660
CONFIG_CRYPTO_CAMELLIA=m
661661
CONFIG_CRYPTO_CAST5=m
662662
CONFIG_CRYPTO_CAST6=m
663+
CONFIG_CRYPTO_DES=m
663664
CONFIG_CRYPTO_FCRYPT=m
664665
CONFIG_CRYPTO_KHAZAD=m
665666
CONFIG_CRYPTO_SALSA20=m
@@ -681,6 +682,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
681682
CONFIG_CRYPTO_USER_API_RNG=m
682683
CONFIG_CRYPTO_USER_API_AEAD=m
683684
# CONFIG_CRYPTO_HW is not set
685+
CONFIG_PRIME_NUMBERS=m
684686
CONFIG_CRC32_SELFTEST=m
685687
CONFIG_CRC64=m
686688
CONFIG_XZ_DEC_TEST=m
@@ -709,6 +711,7 @@ CONFIG_TEST_OVERFLOW=m
709711
CONFIG_TEST_RHASHTABLE=m
710712
CONFIG_TEST_HASH=m
711713
CONFIG_TEST_IDA=m
714+
CONFIG_TEST_BITOPS=m
712715
CONFIG_TEST_VMALLOC=m
713716
CONFIG_TEST_USER_COPY=m
714717
CONFIG_TEST_BPF=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ CONFIG_CRYPTO_BLOWFISH=m
542542
CONFIG_CRYPTO_CAMELLIA=m
543543
CONFIG_CRYPTO_CAST5=m
544544
CONFIG_CRYPTO_CAST6=m
545+
CONFIG_CRYPTO_DES=m
545546
CONFIG_CRYPTO_FCRYPT=m
546547
CONFIG_CRYPTO_KHAZAD=m
547548
CONFIG_CRYPTO_SALSA20=m
@@ -563,6 +564,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
563564
CONFIG_CRYPTO_USER_API_RNG=m
564565
CONFIG_CRYPTO_USER_API_AEAD=m
565566
# CONFIG_CRYPTO_HW is not set
567+
CONFIG_PRIME_NUMBERS=m
566568
CONFIG_CRC32_SELFTEST=m
567569
CONFIG_CRC64=m
568570
CONFIG_XZ_DEC_TEST=m
@@ -591,6 +593,7 @@ CONFIG_TEST_OVERFLOW=m
591593
CONFIG_TEST_RHASHTABLE=m
592594
CONFIG_TEST_HASH=m
593595
CONFIG_TEST_IDA=m
596+
CONFIG_TEST_BITOPS=m
594597
CONFIG_TEST_VMALLOC=m
595598
CONFIG_TEST_USER_COPY=m
596599
CONFIG_TEST_BPF=m

0 commit comments

Comments
 (0)