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

Commit be49c613 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-df0daba8' into msm-4.14" into msm-4.14

parents 8b0dbf0b 3ba3c6ce

Documentation/devicetree/bindings/power/mti,mips-cpc.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Binding for MIPS Cluster Power Controller (CPC).



This binding allows a system to specify where the CPC registers are

located.



Required properties:

compatible : Should be "mti,mips-cpc".

regs: Should describe the address & size of the CPC register region.

Documentation/sphinx/kerneldoc.py

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ import glob 


from docutils import nodes, statemachine

from docutils.statemachine import ViewList

from docutils.parsers.rst import directives

from sphinx.util.compat import Directive

from docutils.parsers.rst import directives, Directive

from sphinx.ext.autodoc import AutodocReporter



__version__  = '1.0'

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9001,6 +9001,7 @@ MIPS GENERIC PLATFORM 
M:	Paul Burton <paul.burton@mips.com>

L:	linux-mips@linux-mips.org

S:	Supported

F:	Documentation/devicetree/bindings/power/mti,mips-cpc.txt

F:	arch/mips/generic/

F:	arch/mips/tools/generic-board-config.sh

Makefile

+136 −115
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 26

SUBLEVEL = 27

EXTRAVERSION =

NAME = Petit Gorille
@@ -11,6 +11,10 @@ NAME = Petit Gorille 
# Comments in this file are targeted only to the developer, do not

# expect to learn how to build the kernel reading this file.



# That's our default target when none is given on the command line

PHONY := _all

_all:



# o Do not use make's built-in rules and variables

#   (this increases performance and avoids hard-to-debug behaviour);

# o Look for make include files relative to root of kernel src
@@ -117,10 +121,6 @@ ifeq ("$(origin O)", "command line") 
  KBUILD_OUTPUT := $(O)

endif



# That's our default target when none is given on the command line

PHONY := _all

_all:



# Cancel implicit rules on top Makefile

$(CURDIR)/Makefile Makefile: ;
@@ -187,15 +187,6 @@ ifeq ("$(origin M)", "command line") 
  KBUILD_EXTMOD := $(M)

endif



# If building an external module we do not care about the all: rule

# but instead _all depend on modules

PHONY += all

ifeq ($(KBUILD_EXTMOD),)

_all: all

else

_all: modules

endif



ifeq ($(KBUILD_SRC),)

        # building in the source tree

        srctree := .
@@ -207,6 +198,9 @@ else 
                srctree := $(KBUILD_SRC)

        endif

endif



export KBUILD_CHECKSRC KBUILD_EXTMOD KBUILD_SRC



objtree		:= .

src		:= $(srctree)

obj		:= $(objtree)
@@ -215,6 +209,74 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) 


export srctree objtree VPATH



# To make sure we do not include .config for any of the *config targets

# catch them early, and hand them over to scripts/kconfig/Makefile

# It is allowed to specify more targets when calling make, including

# mixing *config targets and build targets.

# For example 'make oldconfig all'.

# Detect when mixed targets is specified, and make a second invocation

# of make so .config is not included in this case either (for *config).



version_h := include/generated/uapi/linux/version.h

old_version_h := include/linux/version.h



no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help% %docs check% coccicheck \

			 $(version_h) headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0

mixed-targets  := 0

dot-config     := 1



ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)

		dot-config := 0

	endif

endif



ifeq ($(KBUILD_EXTMOD),)

        ifneq ($(filter config %config,$(MAKECMDGOALS)),)

                config-targets := 1

                ifneq ($(words $(MAKECMDGOALS)),1)

                        mixed-targets := 1

                endif

        endif

endif

# install and modules_install need also be processed one by one

ifneq ($(filter install,$(MAKECMDGOALS)),)

        ifneq ($(filter modules_install,$(MAKECMDGOALS)),)

	        mixed-targets := 1

        endif

endif



ifeq ($(mixed-targets),1)

# ===========================================================================

# We're called with mixed targets (*config and build targets).

# Handle them one by one.



PHONY += $(MAKECMDGOALS) __build_one_by_one



$(filter-out __build_one_by_one, $(MAKECMDGOALS)): __build_one_by_one

	@:



__build_one_by_one:

	$(Q)set -e; \

	for i in $(MAKECMDGOALS); do \

		$(MAKE) -f $(srctree)/Makefile $$i; \

	done



else



# We need some generic definitions (do not try to remake the file).

scripts/Kbuild.include: ;

include scripts/Kbuild.include



# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)

export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION



# SUBARCH tells the usermode build what the underlying arch is.  That is set

# first, and if a usermode build is happening, the "ARCH=um" on the command

# line overrides the setting of ARCH below.  If a native build is happening,
@@ -312,40 +374,6 @@ HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \ 
		-Wno-missing-field-initializers

endif



# Decide whether to build built-in, modular, or both.

# Normally, just do built-in.



KBUILD_MODULES :=

KBUILD_BUILTIN := 1



# If we have only "make modules", don't compile built-in objects.

# When we're building modules with modversions, we need to consider

# the built-in objects during the descend as well, in order to

# make sure the checksums are up to date before we record them.



ifeq ($(MAKECMDGOALS),modules)

  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)

endif



# If we have "make <whatever> modules", compile modules

# in addition to whatever we do anyway.

# Just "make" or "make all" shall build modules as well



ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)

  KBUILD_MODULES := 1

endif



ifeq ($(MAKECMDGOALS),)

  KBUILD_MODULES := 1

endif



export KBUILD_MODULES KBUILD_BUILTIN

export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD



# We need some generic definitions (do not try to remake the file).

scripts/Kbuild.include: ;

include scripts/Kbuild.include



# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as

LD		= $(CROSS_COMPILE)ld
@@ -409,11 +437,6 @@ KBUILD_CFLAGS_MODULE := -DMODULE 
KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

GCC_PLUGINS_CFLAGS :=



# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)



export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES

export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
@@ -463,73 +486,24 @@ ifneq ($(KBUILD_SRC),) 
	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)

endif



# Support for using generic headers in asm-generic

PHONY += asm-generic uapi-asm-generic

asm-generic: uapi-asm-generic

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	            src=asm obj=arch/$(SRCARCH)/include/generated/asm

uapi-asm-generic:

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	            src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm



# To make sure we do not include .config for any of the *config targets

# catch them early, and hand them over to scripts/kconfig/Makefile

# It is allowed to specify more targets when calling make, including

# mixing *config targets and build targets.

# For example 'make oldconfig all'.

# Detect when mixed targets is specified, and make a second invocation

# of make so .config is not included in this case either (for *config).



version_h := include/generated/uapi/linux/version.h

old_version_h := include/linux/version.h



no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help% %docs check% coccicheck \

			 $(version_h) headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0

mixed-targets  := 0

dot-config     := 1



ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)

		dot-config := 0

	endif

endif



ifeq ($(KBUILD_EXTMOD),)

        ifneq ($(filter config %config,$(MAKECMDGOALS)),)

                config-targets := 1

                ifneq ($(words $(MAKECMDGOALS)),1)

                        mixed-targets := 1

                endif

        endif

ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

# install and modules_install need also be processed one by one

ifneq ($(filter install,$(MAKECMDGOALS)),)

        ifneq ($(filter modules_install,$(MAKECMDGOALS)),)

	        mixed-targets := 1

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

endif



ifeq ($(mixed-targets),1)

# ===========================================================================

# We're called with mixed targets (*config and build targets).

# Handle them one by one.



PHONY += $(MAKECMDGOALS) __build_one_by_one



$(filter-out __build_one_by_one, $(MAKECMDGOALS)): __build_one_by_one

	@:

RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk

RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS



__build_one_by_one:

	$(Q)set -e; \

	for i in $(MAKECMDGOALS); do \

		$(MAKE) -f $(srctree)/Makefile $$i; \

	done



else

ifeq ($(config-targets),1)

# ===========================================================================

# *config targets only - make sure prerequisites are updated, and descend
@@ -552,6 +526,44 @@ else 
# Build targets only - this includes vmlinux, arch specific targets, clean

# targets and others. In general all targets except *config targets.



# If building an external module we do not care about the all: rule

# but instead _all depend on modules

PHONY += all

ifeq ($(KBUILD_EXTMOD),)

_all: all

else

_all: modules

endif



# Decide whether to build built-in, modular, or both.

# Normally, just do built-in.



KBUILD_MODULES :=

KBUILD_BUILTIN := 1



# If we have only "make modules", don't compile built-in objects.

# When we're building modules with modversions, we need to consider

# the built-in objects during the descend as well, in order to

# make sure the checksums are up to date before we record them.



ifeq ($(MAKECMDGOALS),modules)

  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)

endif



# If we have "make <whatever> modules", compile modules

# in addition to whatever we do anyway.

# Just "make" or "make all" shall build modules as well



ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)

  KBUILD_MODULES := 1

endif



ifeq ($(MAKECMDGOALS),)

  KBUILD_MODULES := 1

endif



export KBUILD_MODULES KBUILD_BUILTIN



ifeq ($(KBUILD_EXTMOD),)

# Additional helpers built in scripts/

# Carefully list dependencies so we do not try to build scripts twice
@@ -1091,6 +1103,15 @@ prepare0: archprepare gcc-plugins 
# All the preparing..

prepare: prepare0 prepare-objtool



# Support for using generic headers in asm-generic

PHONY += asm-generic uapi-asm-generic

asm-generic: uapi-asm-generic

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	            src=asm obj=arch/$(SRCARCH)/include/generated/asm

uapi-asm-generic:

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	            src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm



PHONY += prepare-objtool

prepare-objtool: $(objtool_target)

arch/arm/mach-omap2/omap-secure.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base(void) 
	return omap_secure_memblock_base;

}



#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)

u32 omap3_save_secure_ram(void __iomem *addr, int size)

{

	u32 ret;
@@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) 


	return ret;

}

#endif



/**

 * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls