diff options
author | Ting Liu <ting.liu@nxp.com> | 2016-06-16 17:04:22 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-06-23 10:41:54 +0800 |
commit | ad53934bfb7602362eff7fc27878ca0e6b42882a (patch) | |
tree | 693c61b60f264acab55b16fa84c303d9d4a3b710 | |
parent | e6cb0dba0757186c3e84488fa5e45e67532cf367 (diff) | |
download | meta-fsl-ppc-ad53934bfb7602362eff7fc27878ca0e6b42882a.tar.gz |
linux-qoriq: merge .inc and .bb
Signed-off-by: Ting Liu <ting.liu@nxp.com>
-rw-r--r-- | recipes-kernel/linux/linux-qoriq.inc | 51 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq_3.12.bb | 51 |
2 files changed, 50 insertions, 52 deletions
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc deleted file mode 100644 index 15a9f1a..0000000 --- a/recipes-kernel/linux/linux-qoriq.inc +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | inherit kernel kernel-arch qoriq_build_64bit_kernel | ||
2 | require recipes-kernel/linux/linux-dtb.inc | ||
3 | |||
4 | DESCRIPTION = "Linux kernel for Freescale platforms" | ||
5 | SECTION = "kernel" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | ||
8 | |||
9 | KSRC ?= "" | ||
10 | S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}' | ||
11 | |||
12 | DEPENDS_append = " libgcc" | ||
13 | # not put Images into /boot of rootfs, install kernel-image if needed | ||
14 | RDEPENDS_kernel-base = "" | ||
15 | |||
16 | KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" | ||
17 | KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" | ||
18 | |||
19 | SCMVERSION ?= "y" | ||
20 | DELTA_KERNEL_DEFCONFIG ?= "" | ||
21 | do_configure_prepend() { | ||
22 | # copy desired defconfig so we pick it up for the real kernel_do_configure | ||
23 | cp ${KERNEL_DEFCONFIG} ${B}/.config | ||
24 | |||
25 | # add config fragments | ||
26 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | ||
27 | if [ -f "${deltacfg}" ]; then | ||
28 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} | ||
29 | elif [ -f "${WORKDIR}/${deltacfg}" ]; then | ||
30 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} | ||
31 | elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then | ||
32 | ${S}/scripts/kconfig/merge_config.sh -m .config \ | ||
33 | ${S}/arch/powerpc/configs/${deltacfg} | ||
34 | fi | ||
35 | done | ||
36 | |||
37 | #add git revision to the local version | ||
38 | if [ "${SCMVERSION}" = "y" ]; then | ||
39 | # append sdk version if SDK_VERSION is defined | ||
40 | sdkversion='' | ||
41 | if [ -n "${SDK_VERSION}" ]; then | ||
42 | sdkversion="-${SDK_VERSION}" | ||
43 | fi | ||
44 | head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` | ||
45 | printf "%s%s%s" $sdkversion +g $head > ${B}/.scmversion | ||
46 | fi | ||
47 | } | ||
48 | |||
49 | # make everything compatible for the time being | ||
50 | COMPATIBLE_MACHINE_$MACHINE = "$MACHINE" | ||
51 | |||
diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb index 744aa4e..533225d 100644 --- a/recipes-kernel/linux/linux-qoriq_3.12.bb +++ b/recipes-kernel/linux/linux-qoriq_3.12.bb | |||
@@ -1,4 +1,10 @@ | |||
1 | require recipes-kernel/linux/linux-qoriq.inc | 1 | inherit kernel kernel-arch qoriq_build_64bit_kernel |
2 | require recipes-kernel/linux/linux-dtb.inc | ||
3 | |||
4 | DESCRIPTION = "Linux kernel for Freescale platforms" | ||
5 | SECTION = "kernel" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | ||
2 | 8 | ||
3 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \ | 9 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \ |
4 | file://modify-defconfig-t1040-nr-cpus.patch \ | 10 | file://modify-defconfig-t1040-nr-cpus.patch \ |
@@ -8,3 +14,46 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \ | |||
8 | file://module-remove-MODULE_GENERIC_TABLE.patch \ | 14 | file://module-remove-MODULE_GENERIC_TABLE.patch \ |
9 | " | 15 | " |
10 | SRCREV = "43cecda943a6c40a833b588801b0929e8bd48813" | 16 | SRCREV = "43cecda943a6c40a833b588801b0929e8bd48813" |
17 | |||
18 | KSRC ?= "" | ||
19 | S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}' | ||
20 | |||
21 | DEPENDS_append = " libgcc" | ||
22 | # not put Images into /boot of rootfs, install kernel-image if needed | ||
23 | RDEPENDS_kernel-base = "" | ||
24 | |||
25 | KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" | ||
26 | KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" | ||
27 | |||
28 | SCMVERSION ?= "y" | ||
29 | DELTA_KERNEL_DEFCONFIG ?= "" | ||
30 | do_configure_prepend() { | ||
31 | # copy desired defconfig so we pick it up for the real kernel_do_configure | ||
32 | cp ${KERNEL_DEFCONFIG} ${B}/.config | ||
33 | |||
34 | # add config fragments | ||
35 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | ||
36 | if [ -f "${deltacfg}" ]; then | ||
37 | ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} | ||
38 | elif [ -f "${WORKDIR}/${deltacfg}" ]; then | ||
39 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} | ||
40 | elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then | ||
41 | ${S}/scripts/kconfig/merge_config.sh -m .config \ | ||
42 | ${S}/arch/powerpc/configs/${deltacfg} | ||
43 | fi | ||
44 | done | ||
45 | |||
46 | #add git revision to the local version | ||
47 | if [ "${SCMVERSION}" = "y" ]; then | ||
48 | # append sdk version if SDK_VERSION is defined | ||
49 | sdkversion='' | ||
50 | if [ -n "${SDK_VERSION}" ]; then | ||
51 | sdkversion="-${SDK_VERSION}" | ||
52 | fi | ||
53 | head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` | ||
54 | printf "%s%s%s" $sdkversion +g $head > ${B}/.scmversion | ||
55 | fi | ||
56 | } | ||
57 | |||
58 | # make everything compatible for the time being | ||
59 | COMPATIBLE_MACHINE_$MACHINE = "$MACHINE" | ||