Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45f5532a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - VLA removal

 - gcc-8.x build fixes

 - small improvements and cleanups

 - defconfig updates

* tag 'm68k-for-v5.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Add -ffreestanding to CFLAGS
  m68k/apollo: Fix comment in Makefile
  dio: Fix buffer overflow in case of unknown board
  m68k/defconfig: Update defconfigs for v5.0-rc1
  m68k/atari: Avoid VLA use in atari_switches_setup()
  m68k: Avoid VLA use in mangle_kernel_stack()
  m68k/mac: Use '030 reset method on SE/30
  m68k/mac: Remove obsolete comment
  m68k/mac: Skip VIA port setup unless RTC is connected
  m68k/mac: Clean up unused timer definitions
  m68k/defconfig: Drop NET_VENDOR_<FOO>=n
parents eac61655 28713169

arch/m68k/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -58,7 +58,10 @@ cpuflags-$(CONFIG_M5206e) := $(call cc-option,-mcpu=5206e,-m5200) 
cpuflags-$(CONFIG_M5206)	:= $(call cc-option,-mcpu=5206,-m5200)



KBUILD_AFLAGS += $(cpuflags-y)

KBUILD_CFLAGS += $(cpuflags-y) -pipe

KBUILD_CFLAGS += $(cpuflags-y)



KBUILD_CFLAGS += -pipe -ffreestanding



ifdef CONFIG_MMU

# without -fno-strength-reduce the 53c7xx.c driver fails ;-(

KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2

arch/m68k/apollo/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Makefile for Linux arch/m68k/amiga source directory

# Makefile for Linux arch/m68k/apollo source directory

#



obj-y		:= config.o dn_ints.o

arch/m68k/atari/config.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int __init atari_parse_bootinfo(const struct bi_record *record) 
/* Parse the Atari-specific switches= option. */

static int __init atari_switches_setup(char *str)

{

	char switches[strlen(str) + 1];

	char switches[COMMAND_LINE_SIZE];

	char *p;

	int ovsc_shift;

	char *args = switches;

arch/m68k/configs/amcore_defconfig

+0 −20
Original line number Diff line number Diff line
@@ -55,27 +55,7 @@ CONFIG_MTD_UCLINUX=y 
CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

CONFIG_DM9000=y

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

arch/m68k/configs/amiga_defconfig

+2 −35
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -304,7 +303,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -342,7 +340,6 @@ CONFIG_BLK_DEV_GAYLE=y 
CONFIG_BLK_DEV_BUDDHA=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -399,44 +396,12 @@ CONFIG_MACSEC=m 
CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_AMAZON is not set

CONFIG_A2065=y

CONFIG_ARIADNE=y

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

CONFIG_XSURF100=y

CONFIG_HYDRA=y

CONFIG_APNE=y

CONFIG_ZORRO8390=y

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -612,6 +577,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -621,6 +587,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m