Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 0 additions & 34 deletions Documentation/devicetree/bindings/arm/msm/msm_bus.txt

This file was deleted.

76 changes: 30 additions & 46 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 4
SUBLEVEL = 110
EXTRAVERSION = --ThE-ShAdOw-v1.1--
EXTRAVERSION =
NAME = Saber-toothed Squirrel

# *DOCUMENTATION*
Expand Down Expand Up @@ -162,7 +162,7 @@ export srctree objtree VPATH
# 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,
# then ARCH is assigned, getting whatever value it gets normally, and
# then ARCH is assigned, getting whatever value it gets normally, and
# SUBARCH is subsequently ignored.

SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
Expand All @@ -171,6 +171,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ )

SUBARCH := arm

# Cross compiling and selecting different set of gcc/bin-utils
# ---------------------------------------------------------------------------
#
Expand All @@ -192,7 +194,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
export KBUILD_BUILDHOST := $(SUBARCH)
ARCH ?= arm
ARCH ?=arm
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)

# Architecture as present in compile.h
Expand Down Expand Up @@ -243,10 +245,10 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
else echo sh; fi ; fi)

HOSTCC = ccache gcc
HOSTCXX = ccache g++
HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O3 -fomit-frame-pointer
HOSTCXXFLAGS = -O3
HOSTCC = gcc
HOSTCXX = g++
HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCXXFLAGS = -O2

# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
Expand Down Expand Up @@ -289,7 +291,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
#
# If $(quiet) is empty, the whole command will be printed.
# If it is set to "quiet_", only the short version will be printed.
# If it is set to "quiet_", only the short version will be printed.
# If it is set to "silent_", nothing will be printed at all, since
# the variable $(silent_cmd_cc_o_c) doesn't exist.
#
Expand Down Expand Up @@ -330,7 +332,7 @@ include $(srctree)/scripts/Kbuild.include

AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld
REAL_CC = ccache $(CROSS_COMPILE)gcc
REAL_CC = $(CROSS_COMPILE)gcc
CPP = $(CC) -E
AR = $(CROSS_COMPILE)ar
NM = $(CROSS_COMPILE)nm
Expand All @@ -347,24 +349,17 @@ CHECK = sparse

# Use the wrapper for the compiler. This wrapper scans for new
# warnings and causes the build to stop upon encountering them.
CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)

CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-Wbitwise -Wno-return-void $(CF)
CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)

LIN_FLAG = -mfloat-abi=soft -munaligned-access -marm -march=armv7-a -mtune=cortex-a5 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad \
-ffloat-store -ffast-math -foptimize-sibling-calls -fcrossjumping -fgcse-lm -fgcse-sm -fgcse-las -fsched-spec-load \
-fforce-addr -fsingle-precision-constant -funsafe-math-optimizations -ftree-vectorize -funswitch-loops -fno-toplevel-reorder \
-fuse-linker-plugin -fpredictive-commoning -fgraphite -fgraphite-identity -ftree-loop-linear -floop-interchange -floop-strip-mine \
-floop-block -fsanitize=leak -fopenmp -lgomp -lgcc -pipe
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-Wbitwise -Wno-return-void $(CF)
CFLAGS_MODULE =
AFLAGS_MODULE =
LDFLAGS_MODULE =
CFLAGS_KERNEL =
AFLAGS_KERNEL =
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage

MODFLAGS = -DMODULE $(LIN_FLAG)
CFLAGS_MODULE = $(MODFLAGS) -fno-pic
AFLAGS_MODULE = $(MODFLAGS) -fno-pic
LDFLAGS_MODULE =
CFLAGS_KERNEL = $(LIN_FLAG)
AFLAGS_KERNEL = $(LIN_FLAG)
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage

# Use LINUXINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option
Expand All @@ -375,22 +370,16 @@ LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \

KBUILD_CPPFLAGS := -D__KERNEL__

#
# Optimizations
#
CFLAGS_A5 = -mtune=cortex-a5 -marm -march=armv7-a -mfpu=neon-vfpv4 -funsafe-math-optimizations -ftree-vectorize
CFLAGS_MODULO = -fmodulo-sched -fmodulo-sched-allow-regmoves
KERNEL_MODS = $(CFLAGS_A5) $(CFLAGS_MODULO)

KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-Wno-array-bounds \
-Wno-maybe-uninitialized \
-Wno-unused-value \
-Wno-sequence-point \
-Wno-address \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration \
-Wno-format-security \
-fno-delete-null-pointer-checks \
-mno-unaligned-access \
-Wno-sizeof-pointer-memaccess \
$(KERNEL_MODS)

-fno-delete-null-pointer-checks
KBUILD_AFLAGS_KERNEL :=
KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS := -D__ASSEMBLY__
Expand Down Expand Up @@ -583,7 +572,7 @@ all: vmlinux
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os
else
KBUILD_CFLAGS += -O3
KBUILD_CFLAGS += -O2
endif

include $(srctree)/arch/$(SRCARCH)/Makefile
Expand All @@ -592,9 +581,6 @@ ifneq ($(CONFIG_FRAME_WARN),0)
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
endif

# Tell gcc to never replace conditional load with a non-conditional one
KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)

# Force gcc to behave correct even for buggy distributions
ifndef CONFIG_CC_STACKPROTECTOR
KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
Expand All @@ -617,8 +603,6 @@ KBUILD_CFLAGS += -fomit-frame-pointer
endif
endif

KBUILD_CFLAGS += $(call cc-option, -fno-var-tracking-assignments)

ifdef CONFIG_DEBUG_INFO
KBUILD_CFLAGS += -g
KBUILD_AFLAGS += -gdwarf-2
Expand Down Expand Up @@ -878,7 +862,7 @@ endef
# First command is ':' to allow us to use + in front of this rule
cmd_ksym_ld = $(cmd_vmlinux__)
define rule_ksym_ld
:
:
+$(call cmd,vmlinux_version)
$(call cmd,vmlinux__)
$(Q)echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
Expand Down Expand Up @@ -957,7 +941,7 @@ modpost-init := $(filter-out init/built-in.o, $(vmlinux-init))
vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
$(call if_changed_rule,vmlinux-modpost)

# The actual objects are generated when descending,
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;

Expand Down Expand Up @@ -1547,7 +1531,7 @@ endif
$(build)=$(build-dir) $(@:.ko=.o)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

# FIXME Should go into a make.lib or something
# FIXME Should go into a make.lib or something
# ===========================================================================

quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs)))
Expand Down
7 changes: 7 additions & 0 deletions arch/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ config HAVE_HW_BREAKPOINT
bool
depends on PERF_EVENTS

config HAVE_HW_BRKPT_RESERVED_RW_ACCESS
bool
depends on HAVE_HW_BREAKPOINT
help
Some of the hardware might not have r/w access beyond a certain number
of breakpoint register access.

config HAVE_MIXED_BREAKPOINTS_REGS
bool
depends on HAVE_HW_BREAKPOINT
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ config ARM
select HAVE_PERF_EVENTS
select PERF_USE_VMALLOC
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
#select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
select HAVE_C_RECORDMCOUNT
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
Expand Down
Loading