CRIS port changes for 4.16
Includes only a small fix for some conflicting symbols, aligning CRIS
with other platforms.
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlp5frcACgkQ31LbvUHyf1e9rACbBugJIN2v+wHZ2+XmQOW27hDp
V/IAn1HkpGdwyxxCZ6JZnr/XAtCi1RhJ
=EP69
-----END PGP SIGNATURE-----
mergetag object 6e0377212c
type commit
tag cris-for-4.16-urgent
tagger Jesper Nilsson <jesper@jni.nu> 1518084841 +0100
CRIS urgent breakage fix for 4.16
The main Makefile for the CRIS port was
overzealously scrubbed in 4.15-rc3,
breaking the build for all CRIS SoCs.
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlp8I9IACgkQ31LbvUHyf1dIiACeP/H/3asKo7JgidYmA1gkEk4A
oiwAn0QXaFm5ljxuBSd88FIr4E5vfwdD
=fjIf
-----END PGP SIGNATURE-----
Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS updates and fixes from Jesper Nilsson:
- a small fix for some conflicting symbols, aligning CRIS with other
platforms.
- fix build breakage regression for all CRIS SoCs. The main Makefile
for the CRIS port was overzealously scrubbed in 4.15-rc3.
* tag 'cris-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
cris: Fix conflicting types for _etext, _edata, _end
* tag 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
CRIS: Restore mistakenly cleared kernel Makefile
This commit is contained in:
commit
977e41524d
|
@ -0,0 +1,17 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for the CRIS port.
|
||||
#
|
||||
|
||||
CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
|
||||
extra-y := vmlinux.lds
|
||||
|
||||
obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o
|
||||
obj-y += stacktrace.o
|
||||
|
||||
obj-$(CONFIG_MODULES) += crisksyms.o
|
||||
obj-$(CONFIG_MODULES) += module.o
|
||||
obj-$(CONFIG_SYSTEM_PROFILER) += profile.o
|
||||
|
||||
clean:
|
||||
|
|
@ -24,6 +24,7 @@
|
|||
#include <linux/of_fdt.h>
|
||||
#include <asm/setup.h>
|
||||
#include <arch/system.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
/*
|
||||
* Setup options
|
||||
|
@ -31,7 +32,6 @@
|
|||
struct screen_info screen_info;
|
||||
|
||||
extern int root_mountflags;
|
||||
extern char _etext, _edata, _end;
|
||||
|
||||
char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };
|
||||
|
||||
|
|
Loading…
Reference in a new issue