Commit Graph

2466 Commits

Author SHA1 Message Date
黄涛
132c57a600 scripts/checkpatch.pl: update to ae3ccc4678 2014-06-23 19:22:25 +08:00
黄涛
3388a670bd rk: gcc-wrapper.py ignore atags_to_fdt.c:96 2014-06-17 12:53:45 +08:00
黄涛
e9fa201a63 rk: add gcc-wrapper 2014-06-16 22:03:54 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
Mark Brown
baa60ad55e Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-21 18:02:00 +01:00
Mark Brown
016e8cd0ca Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk 2014-05-21 17:55:59 +01:00
Jiang Liu
eeae892aea arm64, jump label: detect %c support for ARM64
As commit a9468f30b5 "ARM: 7333/2: jump label: detect %c
support for ARM", this patch detects the same thing for ARM64
because some ARM64 GCC versions have the same issue.

Some versions of ARM64 GCC which do support asm goto, do not
support the %c specifier. Since we need the %c to support jump
labels on ARM64, detect that too in the asm goto detection script
to avoid build errors with these versions.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit f3c003f72d)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-21 17:54:10 +01:00
Mark Brown
c877dd2854 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
	arch/arm64/Makefile
2014-05-18 18:46:41 +01:00
Mark Brown
a5d53ad243 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
	Documentation/arm64/tagged-pointers.txt
	arch/arm64/Kconfig
	arch/arm64/boot/dts/Makefile
	arch/arm64/include/asm/arch_timer.h
	arch/arm64/include/asm/elf.h
	arch/arm64/include/asm/spinlock.h
	arch/arm64/kernel/smp.c
2014-05-15 20:29:29 +01:00
Will Deacon
dc1307d294 arm64: extable: sort the exception table at build time
As is done for other architectures, sort the exception table at
build-time rather than during boot.

Since sortextable appears to be a standalone C program relying on the
host elf.h to provide EM_AARCH64, I've had to add a conditional check in
order to allow cross-compilation on machines that aren't running a
bleeding-edge libc-dev.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit adace89562)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-15 19:59:53 +01:00
Mark Brown
afaa953324 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-08 12:11:39 +01:00
Mark Brown
9b92dfc49a Merge remote-tracking branch 'lsk/v3.10/topic/misc' into linux-linaro-lsk 2014-05-08 12:11:07 +01:00
Mark Brown
17b540de36 dtc: Use general include directory
Since newer DT bindings include references to include/dt-bindings we need
to make this available to build DTs using them. Upstream has a number of
reworkings which are much more invasive but featureful, just include a
minimal fix.

Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-08 12:10:16 +01:00
黄涛
7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10
lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
黄涛
0ffd56dafe Merge tag 'lsk-android-14.03' into develop-3.10
lsk 14.03 Android release
2014-04-15 12:51:10 +08:00
Alex Shi
dca382e80b Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-04-15 09:59:04 +08:00
Nicolas Dichtel
3246a0352e kbuild: fix make headers_install when path is too long
commit c0ff68f161 upstream.

If headers_install is executed from a deep/long directory structure, the
shell's maximum argument length can be execeeded, which breaks the operation
with:

| make[2]: execvp: /bin/sh: Argument list too long
| make[2]: ***

Instead of passing each files name with the entire path, I give only the file
name without the source path and give this path as a new argument to
headers_install.pl.

Because there is three possible paths, I have tree input-files list, one per
path.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Tested-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Cc: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-14 06:42:14 -07:00
黄涛
b9d78430dc Revert "add pnmtodtsi"
This reverts commit d6cb370f19.
2014-04-09 15:52:13 +08:00
黄涛
d189e01506 Revert "open display kernel log in uboot,just support lvds now"
This reverts commit ade9cca99e.
2014-04-09 15:52:13 +08:00
eddie
ade9cca99e open display kernel log in uboot,just support lvds now 2014-04-09 15:20:02 +08:00
eddie
d6cb370f19 add pnmtodtsi 2014-04-09 14:58:35 +08:00
Mark Brown
0f15ea2dcd Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-03-31 23:51:39 +01:00
Ben Hutchings
573994d38b deb-pkg: Fix cross-building linux-headers package
commit f8ce239dfc upstream.

builddeb generates a control file that says the linux-headers package
can only be built for the build system primary architecture.  This
breaks cross-building configurations.  We should use $debarch for this
instead.

Since $debarch is not yet set when generating the control file, set
Architecture: any and use control file variables to fill in the
description.

Fixes: cd8d60a20a ('kbuild: create linux-headers package in deb-pkg')
Reported-and-tested-by: "Niew, Sh." <shniew@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-31 09:58:13 -07:00
Alex Shi
a0692dda2a Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-02-27 09:39:31 +08:00
Jan Moskyto Matejka
5fbbcae34e Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
commit 03b56329f9 upstream.

Commit afe2dab4f6 ("USB: add hex/bcd detection to usb modalias generation")
changed the routine that generates alias ranges. Before that change, only
digits 0-9 were supported; the commit tried to fix the case when the range
includes higher values than 0x9.

Unfortunately, the commit didn't fix the case when the range includes both
0x9 and 0xA, meaning that the final range must look like [x-9A-y] where
x <= 0x9 and y >= 0xA -- instead the [x-9A-x] range was produced.

Modprobe doesn't complain as it sees no difference between no-match and
bad-pattern results of fnmatch().

Fixing this simple bug to fix the aliases.
Also changing the hardcoded beginning of the range to uppercase as all the
other letters are also uppercase in the device version numbers.

Fortunately, this affects only the dvb-usb-dib0700 module, AFAIK.

Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-22 12:41:28 -08:00