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

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

Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris 

Pull CRIS updates from Jesper Nilsson:
 "Three patches for minor issues"

* tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  cris: No need to append -O2 and $(LINUXINCLUDE)
  tty: serial: make crisv10 explicitly non-modular
  cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected
parents 56e9461a 8f50f2a1

arch/cris/boot/compressed/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
# arch/cris/boot/compressed/Makefile

#



asflags-y += $(LINUXINCLUDE)

ccflags-y += -O2 $(LINUXINCLUDE)



# asflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/mach \

# 				    -I$(srctree)/include/asm/arch

# ccflags-$(CONFIG_ETRAX_ARCH_V32) += -O2 -I$(srctree)/include/asm/mach

arch/cris/boot/rescue/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
# asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch

# LD = gcc-cris -mlinux -march=v32 -nostdlib



asflags-y += $(LINUXINCLUDE)

ccflags-y += -O2 $(LINUXINCLUDE)

ifdef CONFIG_ETRAX_AXISFLASHMAP



arch-$(CONFIG_ETRAX_ARCH_V10) = v10

arch-$(CONFIG_ETRAX_ARCH_V32) = v32
@@ -28,6 +28,11 @@ $(obj)/rescue.bin: $(obj)/rescue.o FORCE 
	$(call if_changed,objcopy)

	cp -p $(obj)/rescue.bin $(objtree)



else

$(obj)/rescue.bin:



endif



$(obj)/testrescue.bin: $(obj)/testrescue.o

	$(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/testrescue.o tr.bin

# Pad it to 784 bytes

drivers/tty/serial/crisv10.c

+2 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ static char *serial_version = "$Revision: 1.25 $"; 
#include <linux/bitops.h>

#include <linux/seq_file.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/uaccess.h>

#include <linux/io.h>
@@ -4098,7 +4097,7 @@ static void show_serial_version(void) 
	       &serial_version[11]); /* "$Revision: x.yy" */

}



/* rs_init inits the driver at boot (using the module_init chain) */

/* rs_init inits the driver at boot (using the initcall chain) */



static const struct tty_operations rs_ops = {

	.open = rs_open,
@@ -4247,5 +4246,4 @@ static int __init rs_init(void) 
}



/* this makes sure that rs_init is called during kernel boot */



module_init(rs_init);
 
device_initcall(rs_init);