diff options
author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2013-07-01 13:47:10 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2013-07-03 18:34:31 +0800 |
commit | 5141f03ec9ca07af4f1b60131e623cfff75c326a (patch) | |
tree | 3bd90bd93bed584df8fda394b51e2d037d3a0942 | |
parent | 3947585c2a47d9a441566057721fa3d015f5d635 (diff) | |
download | meta-fsl-ppc-5141f03ec9ca07af4f1b60131e623cfff75c326a.tar.gz |
linux-qoriq-sdk(-headers): upgrade to the version of sdk-1.4
1.Update kernel version to 3.8.
2.add DEPENDS libgcc and append TOOLCHAIN_OPTIONS to KERNEL_{CC,LD}.
kernel in sdk 1.4 need run-time support libraries 'libgcc.a', added
in file arch/powerpc/Makefile:
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
Without passing the TOOLCHAIN_OPTIONS (define --sysroot parameter),
it will fail to find the libgcc.a.
3.Also remove the patches which were already merged on git tree.
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
8 files changed, 57 insertions, 191 deletions
diff --git a/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch b/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch deleted file mode 100644 index 39783ef..0000000 --- a/recipes-kernel/linux/files/0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From 3179602e581b6fe8797a5677d5ac4ecfab065cc6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chunrong Guo <B40290@freescale.com> | ||
3 | Date: Thu, 11 Apr 2013 01:52:48 -0500 | ||
4 | Subject: [PATCH] Enable "the option Automount devtmpfs at /dev" in kernel | ||
5 | |||
6 | Upstream-Status:Pending | ||
7 | Signed-off-by: Chunrong Guo <b40290@freescale.com> | ||
8 | --- | ||
9 | arch/powerpc/configs/85xx/e6500rev1_defconfig | 1 + | ||
10 | arch/powerpc/configs/corenet32_smp_defconfig | 1 + | ||
11 | arch/powerpc/configs/corenet64_smp_defconfig | 1 + | ||
12 | arch/powerpc/configs/mpc85xx_defconfig | 1 + | ||
13 | arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + | ||
14 | 5 files changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/arch/powerpc/configs/85xx/e6500rev1_defconfig b/arch/powerpc/configs/85xx/e6500rev1_defconfig | ||
17 | index 4b5866d..32ebb50 100644 | ||
18 | --- a/arch/powerpc/configs/85xx/e6500rev1_defconfig | ||
19 | +++ b/arch/powerpc/configs/85xx/e6500rev1_defconfig | ||
20 | @@ -72,6 +72,7 @@ CONFIG_IPV6=y | ||
21 | CONFIG_IP_SCTP=m | ||
22 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
23 | CONFIG_DEVTMPFS=y | ||
24 | +CONFIG_DEVTMPFS_MOUNT=y | ||
25 | CONFIG_MTD=y | ||
26 | CONFIG_MTD_CMDLINE_PARTS=y | ||
27 | CONFIG_MTD_CHAR=y | ||
28 | diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig | ||
29 | index b43d4b6..3fe10e5 100644 | ||
30 | --- a/arch/powerpc/configs/corenet32_smp_defconfig | ||
31 | +++ b/arch/powerpc/configs/corenet32_smp_defconfig | ||
32 | @@ -71,6 +71,7 @@ CONFIG_IPV6=y | ||
33 | CONFIG_IP_SCTP=m | ||
34 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
35 | CONFIG_DEVTMPFS=y | ||
36 | +CONFIG_DEVTMPFS_MOUNT=y | ||
37 | CONFIG_MTD=y | ||
38 | CONFIG_MTD_CMDLINE_PARTS=y | ||
39 | CONFIG_MTD_CHAR=y | ||
40 | diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig | ||
41 | index 13b032b..74cc46a 100644 | ||
42 | --- a/arch/powerpc/configs/corenet64_smp_defconfig | ||
43 | +++ b/arch/powerpc/configs/corenet64_smp_defconfig | ||
44 | @@ -66,6 +66,7 @@ CONFIG_IPV6=y | ||
45 | CONFIG_IP_SCTP=m | ||
46 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
47 | CONFIG_DEVTMPFS=y | ||
48 | +CONFIG_DEVTMPFS_MOUNT=y | ||
49 | CONFIG_MTD=y | ||
50 | CONFIG_MTD_CMDLINE_PARTS=y | ||
51 | CONFIG_MTD_CHAR=y | ||
52 | diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig | ||
53 | index 8fb742d..f353a6e 100644 | ||
54 | --- a/arch/powerpc/configs/mpc85xx_defconfig | ||
55 | +++ b/arch/powerpc/configs/mpc85xx_defconfig | ||
56 | @@ -75,6 +75,7 @@ CONFIG_IPV6=y | ||
57 | CONFIG_IP_SCTP=m | ||
58 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
59 | CONFIG_DEVTMPFS=y | ||
60 | +CONFIG_DEVTMPFS_MOUNT=y | ||
61 | CONFIG_MTD=y | ||
62 | CONFIG_MTD_CHAR=y | ||
63 | CONFIG_MTD_BLOCK=y | ||
64 | diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig | ||
65 | index b31c8ac..cdc2c87 100644 | ||
66 | --- a/arch/powerpc/configs/mpc85xx_smp_defconfig | ||
67 | +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | ||
68 | @@ -77,6 +77,7 @@ CONFIG_IPV6=y | ||
69 | CONFIG_IP_SCTP=m | ||
70 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
71 | CONFIG_DEVTMPFS=y | ||
72 | +CONFIG_DEVTMPFS_MOUNT=y | ||
73 | CONFIG_MTD=y | ||
74 | CONFIG_MTD_CHAR=y | ||
75 | CONFIG_MTD_BLOCK=y | ||
76 | -- | ||
77 | 1.7.9.7 | ||
78 | |||
diff --git a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted file mode 100644 index 597fd3b..0000000 --- a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem at gmail.com> | ||
3 | Date: Thu, 5 Jan 2012 11:42:35 -0800 | ||
4 | Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__ | ||
5 | |||
6 | This is required to avoid warnings like | ||
7 | util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem at gmail.com> | ||
10 | --- | ||
11 | tools/perf/util/include/linux/compiler.h | 4 +++- | ||
12 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
13 | |||
14 | --- a/tools/perf/util/include/linux/compiler.h | ||
15 | +++ b/tools/perf/util/include/linux/compiler.h | ||
16 | @@ -4,9 +4,11 @@ | ||
17 | #ifndef __always_inline | ||
18 | #define __always_inline inline | ||
19 | #endif | ||
20 | +#undef __user | ||
21 | #define __user | ||
22 | +#undef __attribute_const__ | ||
23 | #define __attribute_const__ | ||
24 | - | ||
25 | +#undef __used | ||
26 | #define __used __attribute__((__unused__)) | ||
27 | |||
28 | #endif | ||
diff --git a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted file mode 100644 index d3464fb..0000000 --- a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001 | ||
4 | From: Matthew McClintock <msm@freescale.com> | ||
5 | Date: Thu, 6 Sep 2012 13:45:21 -0500 | ||
6 | Subject: powerpc: Fix build dependencies for c files requiring libfdt.h | ||
7 | |||
8 | Several files in obj-plat depend on libfdt header file. Sometimes | ||
9 | when building one can see the following issue. This patch adds | ||
10 | libfdt as dependency to those object files | ||
11 | |||
12 | | In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: | ||
13 | | arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment | ||
14 | | In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: | ||
15 | | arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef | ||
16 | | BOOTCC arch/powerpc/boot/inffast.o | ||
17 | | make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1 | ||
18 | | make[1]: *** Waiting for unfinished jobs.... | ||
19 | | BOOTCC arch/powerpc/boot/inflate.o | ||
20 | | make: *** [uImage] Error 2 | ||
21 | | ERROR: oe_runmake failed | ||
22 | | ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information) | ||
23 | NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed | ||
24 | |||
25 | Signed-off-by: Matthew McClintock <msm@freescale.com> | ||
26 | --- | ||
27 | arch/powerpc/boot/Makefile | 1 + | ||
28 | 1 file changed, 1 insertion(+) | ||
29 | |||
30 | diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile | ||
31 | index b7d8333..6a15c96 100644 | ||
32 | --- a/arch/powerpc/boot/Makefile | ||
33 | +++ b/arch/powerpc/boot/Makefile | ||
34 | @@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot)) | ||
35 | obj-boot := $(addsuffix .o, $(basename $(src-boot))) | ||
36 | obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib)))) | ||
37 | obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) | ||
38 | +obj-plat: $(libfdt) | ||
39 | |||
40 | quiet_cmd_copy_zlib = COPY $@ | ||
41 | cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@ | ||
42 | -- | ||
43 | 1.7.9.7 | ||
44 | |||
diff --git a/recipes-kernel/linux/files/fix_getrusage_for_perf.patch b/recipes-kernel/linux/files/fix_getrusage_for_perf.patch deleted file mode 100644 index 0029fdc..0000000 --- a/recipes-kernel/linux/files/fix_getrusage_for_perf.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | commit 7b78f13603c6fcb64e020a0bbe31a651ea2b657b | ||
2 | Author: Markus Trippelsdorf <markus@trippelsdorf.de> | ||
3 | Date: Wed Apr 4 10:45:27 2012 +0200 | ||
4 | |||
5 | perf tools: Fix getrusage() related build failure on glibc trunk | ||
6 | |||
7 | On a system running glibc trunk perf doesn't build: | ||
8 | |||
9 | CC builtin-sched.o | ||
10 | builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration] | ||
11 | [...] | ||
12 | |||
13 | Fix it by including sys/resource.h. | ||
14 | |||
15 | Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> | ||
16 | Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> | ||
17 | Link: http://lkml.kernel.org/r/20120404084527.GA294@x4 | ||
18 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | ||
19 | |||
20 | Upstream-Status: Backport [3.4] | ||
21 | |||
22 | diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c | ||
23 | index fb8b5f8..1cad3af 100644 | ||
24 | --- a/tools/perf/builtin-sched.c | ||
25 | +++ b/tools/perf/builtin-sched.c | ||
26 | @@ -17,6 +17,7 @@ | ||
27 | #include "util/debug.h" | ||
28 | |||
29 | #include <sys/prctl.h> | ||
30 | +#include <sys/resource.h> | ||
31 | |||
32 | #include <semaphore.h> | ||
33 | #include <pthread.h> | ||
diff --git a/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch b/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch new file mode 100644 index 0000000..0f28d3d --- /dev/null +++ b/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From e60cc1b011bf0f1acdb7e5168b7bed4ebb78c91f Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Wed, 9 Jan 2013 16:24:39 -0500 | ||
4 | Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file | ||
5 | |||
6 | If headers_install is executed from a deep/long directory structure, the | ||
7 | shell's maximum argument length can be execeeded, which breaks the operation | ||
8 | with: | ||
9 | |||
10 | | make[2]: execvp: /bin/sh: Argument list too long | ||
11 | | make[2]: *** | ||
12 | |||
13 | By dumping the input files to a scratch file and using xargs to read the | ||
14 | input list from the scratch file, we can avoid blowing out the maximum | ||
15 | argument size and install headers in a long path name environment. | ||
16 | |||
17 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
18 | --- | ||
19 | scripts/Makefile.headersinst | 4 +++- | ||
20 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
21 | |||
22 | diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst | ||
23 | index 06ba4a7..536d722 100644 | ||
24 | --- a/scripts/Makefile.headersinst | ||
25 | +++ b/scripts/Makefile.headersinst | ||
26 | @@ -71,7 +71,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) | ||
27 | quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ | ||
28 | file$(if $(word 2, $(all-files)),s)) | ||
29 | cmd_install = \ | ||
30 | - $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \ | ||
31 | + xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \ | ||
32 | for F in $(wrapper-files); do \ | ||
33 | echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ | ||
34 | done; \ | ||
35 | @@ -100,7 +100,9 @@ targets += $(install-file) | ||
36 | $(install-file): scripts/headers_install.pl $(input-files) FORCE | ||
37 | $(if $(unwanted),$(call cmd,remove),) | ||
38 | $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) | ||
39 | + @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files | ||
40 | $(call if_changed,install) | ||
41 | + @rm $(INSTALL_HDR_PATH)/.input-files | ||
42 | |||
43 | else | ||
44 | __headerscheck: $(subdirs) $(check-file) | ||
45 | -- | ||
46 | 1.7.0.4 | ||
diff --git a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb index b1cbb8d..0ee4fc1 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb +++ b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb | |||
@@ -2,6 +2,8 @@ DESCRIPTION = "Linux kernel headers for Freescale platforms" | |||
2 | SECTION = "devel" | 2 | SECTION = "devel" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | 4 | ||
5 | PR = "${INC_PR}.1" | ||
6 | |||
5 | INHIBIT_DEFAULT_DEPS = "1" | 7 | INHIBIT_DEFAULT_DEPS = "1" |
6 | PROVIDES = "linux-libc-headers ${PN}" | 8 | PROVIDES = "linux-libc-headers ${PN}" |
7 | RPROVIDES_${PN}-dev += "linux-libc-headers-dev" | 9 | RPROVIDES_${PN}-dev += "linux-libc-headers-dev" |
@@ -11,6 +13,8 @@ RRECOMMENDS_${PN}-dbg = "linux-libc-headers-dev (= ${EXTENDPKGV})" | |||
11 | 13 | ||
12 | require recipes-kernel/linux/linux-qoriq-sdk.inc | 14 | require recipes-kernel/linux/linux-qoriq-sdk.inc |
13 | 15 | ||
16 | SRC_URI_append += " file://scripts-Makefile.headersinst-install-headers-from-sc.patch" | ||
17 | |||
14 | inherit kernel-arch | 18 | inherit kernel-arch |
15 | 19 | ||
16 | do_configure() { | 20 | do_configure() { |
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb index a015e49..502132f 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk.bb +++ b/recipes-kernel/linux/linux-qoriq-sdk.bb | |||
@@ -7,11 +7,11 @@ LICENSE = "GPLv2" | |||
7 | 7 | ||
8 | require recipes-kernel/linux/linux-qoriq-sdk.inc | 8 | require recipes-kernel/linux/linux-qoriq-sdk.inc |
9 | 9 | ||
10 | PR = "r11" | 10 | PR = "${INC_PR}.1" |
11 | 11 | ||
12 | SRC_URI += "file://fix_getrusage_for_perf.patch \ | 12 | DEPENDS_append = " libgcc" |
13 | file://0001-Enable-the-option-Automount-devtmpfs-at-dev-in-kerne.patch \ | 13 | KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" |
14 | " | 14 | KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" |
15 | 15 | ||
16 | do_configure_prepend() { | 16 | do_configure_prepend() { |
17 | # copy desired defconfig so we pick it up for the real kernel_do_configure | 17 | # copy desired defconfig so we pick it up for the real kernel_do_configure |
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc index f77543e..1c66f9b 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk.inc +++ b/recipes-kernel/linux/linux-qoriq-sdk.inc | |||
@@ -1,11 +1,10 @@ | |||
1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
2 | 2 | ||
3 | PV = "3.0.51" | 3 | PV = "3.8" |
4 | PR = "r11" | 4 | INC_PR = "r11" |
5 | 5 | ||
6 | SRCREV = "faac5211f398f25e2be44ac996895335d5218516" | 6 | SRCREV = "4b66366af2d77de68f4bd6548d07421e13d3df05" |
7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ | 7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ |
8 | file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | KSRC ?= "" | 10 | KSRC ?= "" |