Commit 8c4e1c02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 05119217 382f429b

arch/m68k/Kbuild

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y				+= kernel/ mm/

obj-$(CONFIG_Q40)		+= q40/

obj-$(CONFIG_AMIGA)		+= amiga/

obj-$(CONFIG_ATARI)		+= atari/

obj-$(CONFIG_MAC)		+= mac/

obj-$(CONFIG_HP300)		+= hp300/

obj-$(CONFIG_APOLLO)		+= apollo/

obj-$(CONFIG_MVME147)		+= mvme147/

obj-$(CONFIG_MVME16x)		+= mvme16x/

obj-$(CONFIG_BVME6000)		+= bvme6000/

obj-$(CONFIG_SUN3X)		+= sun3x/ sun3/

obj-$(CONFIG_SUN3)		+= sun3/

obj-$(CONFIG_NATFEAT)		+= emu/

obj-$(CONFIG_M68040)		+= fpsp040/

obj-$(CONFIG_M68060)		+= ifpsp060/

obj-$(CONFIG_M68KFPU_EMU)	+= math-emu/

obj-$(CONFIG_M68000)		+= 68000/

obj-$(CONFIG_COLDFIRE)		+= coldfire/

arch/m68k/Makefile

+28 −45
Original line number Diff line number Diff line
@@ -32,30 +32,33 @@ endif 
#	compiler cpu type flag.

#

ifndef CONFIG_M68040

cpuflags-$(CONFIG_M68060)	:= -m68060

cpuflags-$(CONFIG_M68060)	= -m68060

endif

ifndef CONFIG_M68060

cpuflags-$(CONFIG_M68040)	:= -m68040

cpuflags-$(CONFIG_M68040)	= -m68040

endif

cpuflags-$(CONFIG_M68030)	:=

cpuflags-$(CONFIG_M68020)	:=

cpuflags-$(CONFIG_M68000)	:= -m68000

cpuflags-$(CONFIG_M5441x)	:= $(call cc-option,-mcpu=54455,-mcfv4e)

cpuflags-$(CONFIG_M54xx)	:= $(call cc-option,-mcpu=5475,-m5200)

cpuflags-$(CONFIG_M5407)	:= $(call cc-option,-mcpu=5407,-m5200)

cpuflags-$(CONFIG_M532x)	:= $(call cc-option,-mcpu=532x,-m5307)

cpuflags-$(CONFIG_M537x)	:= $(call cc-option,-mcpu=537x,-m5307)

cpuflags-$(CONFIG_M5307)	:= $(call cc-option,-mcpu=5307,-m5200)

cpuflags-$(CONFIG_M528x)	:= $(call cc-option,-mcpu=528x,-m5307)

cpuflags-$(CONFIG_M5275)	:= $(call cc-option,-mcpu=5275,-m5307)

cpuflags-$(CONFIG_M5272)	:= $(call cc-option,-mcpu=5272,-m5307)

cpuflags-$(CONFIG_M5271)	:= $(call cc-option,-mcpu=5271,-m5307)

cpuflags-$(CONFIG_M523x)	:= $(call cc-option,-mcpu=523x,-m5307)

cpuflags-$(CONFIG_M525x)	:= $(call cc-option,-mcpu=5253,-m5200)

cpuflags-$(CONFIG_M5249)	:= $(call cc-option,-mcpu=5249,-m5200)

cpuflags-$(CONFIG_M520x)	:= $(call cc-option,-mcpu=5208,-m5200)

cpuflags-$(CONFIG_M5206e)	:= $(call cc-option,-mcpu=5206e,-m5200)

cpuflags-$(CONFIG_M5206)	:= $(call cc-option,-mcpu=5206,-m5200)

cpuflags-$(CONFIG_M68030)	=

cpuflags-$(CONFIG_M68020)	=

cpuflags-$(CONFIG_M68000)	= -m68000

cpuflags-$(CONFIG_M5441x)	= $(call cc-option,-mcpu=54455,-mcfv4e)

cpuflags-$(CONFIG_M54xx)	= $(call cc-option,-mcpu=5475,-m5200)

cpuflags-$(CONFIG_M5407)	= $(call cc-option,-mcpu=5407,-m5200)

cpuflags-$(CONFIG_M532x)	= $(call cc-option,-mcpu=532x,-m5307)

cpuflags-$(CONFIG_M537x)	= $(call cc-option,-mcpu=537x,-m5307)

cpuflags-$(CONFIG_M5307)	= $(call cc-option,-mcpu=5307,-m5200)

cpuflags-$(CONFIG_M528x)	= $(call cc-option,-mcpu=528x,-m5307)

cpuflags-$(CONFIG_M5275)	= $(call cc-option,-mcpu=5275,-m5307)

cpuflags-$(CONFIG_M5272)	= $(call cc-option,-mcpu=5272,-m5307)

cpuflags-$(CONFIG_M5271)	= $(call cc-option,-mcpu=5271,-m5307)

cpuflags-$(CONFIG_M523x)	= $(call cc-option,-mcpu=523x,-m5307)

cpuflags-$(CONFIG_M525x)	= $(call cc-option,-mcpu=5253,-m5200)

cpuflags-$(CONFIG_M5249)	= $(call cc-option,-mcpu=5249,-m5200)

cpuflags-$(CONFIG_M520x)	= $(call cc-option,-mcpu=5208,-m5200)

cpuflags-$(CONFIG_M5206e)	= $(call cc-option,-mcpu=5206e,-m5200)

cpuflags-$(CONFIG_M5206)	= $(call cc-option,-mcpu=5206,-m5200)



# Evaluate tune cc-option calls now

cpuflags-y := $(cpuflags-y)



KBUILD_AFLAGS += $(cpuflags-y)

KBUILD_CFLAGS += $(cpuflags-y)
@@ -67,9 +70,8 @@ ifdef CONFIG_MMU 
KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2

else

# we can use a m68k-linux-gcc toolchain with these in place

KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"

KBUILD_CFLAGS += -D__uClinux__

KBUILD_AFLAGS += -D__uClinux__

KBUILD_CPPFLAGS += -DUTS_SYSNAME=\"uClinux\"

KBUILD_CPPFLAGS += -D__uClinux__

endif



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

head-$(CONFIG_COLDFIRE)		:= arch/m68k/coldfire/head.o



core-y				+= arch/m68k/kernel/	arch/m68k/mm/

core-y				+= arch/m68k/

libs-y				+= arch/m68k/lib/



core-$(CONFIG_Q40)		+= arch/m68k/q40/

core-$(CONFIG_AMIGA)		+= arch/m68k/amiga/

core-$(CONFIG_ATARI)		+= arch/m68k/atari/

core-$(CONFIG_MAC)		+= arch/m68k/mac/

core-$(CONFIG_HP300)		+= arch/m68k/hp300/

core-$(CONFIG_APOLLO)		+= arch/m68k/apollo/

core-$(CONFIG_MVME147)		+= arch/m68k/mvme147/

core-$(CONFIG_MVME16x)		+= arch/m68k/mvme16x/

core-$(CONFIG_BVME6000)		+= arch/m68k/bvme6000/

core-$(CONFIG_SUN3X)		+= arch/m68k/sun3x/	arch/m68k/sun3/

core-$(CONFIG_SUN3)		+= arch/m68k/sun3/	arch/m68k/sun3/prom/

core-$(CONFIG_NATFEAT)		+= arch/m68k/emu/

core-$(CONFIG_M68040)		+= arch/m68k/fpsp040/

core-$(CONFIG_M68060)		+= arch/m68k/ifpsp060/

core-$(CONFIG_M68KFPU_EMU)	+= arch/m68k/math-emu/

core-$(CONFIG_M68000)		+= arch/m68k/68000/

core-$(CONFIG_COLDFIRE)		+= arch/m68k/coldfire/





all:	zImage
@@ -154,8 +138,7 @@ else 
	$(KBZIP2) -1c vmlinux >vmlinux.bz2

endif



archclean:

	rm -f vmlinux.gz vmlinux.bz2

CLEAN_FILES += vmlinux.gz vmlinux.bz2



archheaders:

	$(Q)$(MAKE) $(build)=arch/m68k/kernel/syscalls all

arch/m68k/configs/amiga_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -615,6 +616,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

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
@@ -643,6 +645,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/apollo_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -571,6 +572,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

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
@@ -599,6 +601,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/atari_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -593,6 +594,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

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
@@ -621,6 +623,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE