diff options
author | Denys Dmytriyenko <denys@ti.com> | 2014-10-08 06:17:12 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2014-10-07 20:50:18 -0400 |
commit | 3b14cb6aba91413c1391986d6fea5587b26a4c00 (patch) | |
tree | 91ea17301897056996906f11a7b59e25a05b3025 /recipes-kernel | |
parent | 3070224598c3a0cf0fcdfdfd7adaccbb9a920296 (diff) | |
download | meta-ti-3b14cb6aba91413c1391986d6fea5587b26a4c00.tar.gz |
linux-ti-staging 3.14: update with latest fixes
non-smp configuration has moved to the kernel
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg | 5 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.14.bb | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg deleted file mode 100644 index d61a4139..00000000 --- a/recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | ################################################## | ||
2 | # Non-SMP config options | ||
3 | ################################################## | ||
4 | CONFIG_SMP=n | ||
5 | CONFIG_NR_CPUS=n | ||
diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-kernel/linux/linux-ti-staging_3.14.bb index f0dd841d..180a038d 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.14.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.14.bb | |||
@@ -44,11 +44,11 @@ S = "${WORKDIR}/git" | |||
44 | 44 | ||
45 | BRANCH = "ti-linux-3.14.y" | 45 | BRANCH = "ti-linux-3.14.y" |
46 | 46 | ||
47 | SRCREV = "f56742085ff39d6aa7f487c14a6abff473b4b810" | 47 | SRCREV = "bdbce705b538fb18116afbcf62a59d2fb602de5e" |
48 | PV = "3.14.19" | 48 | PV = "3.14.19" |
49 | 49 | ||
50 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 50 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
51 | MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" | 51 | MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}" |
52 | PR = "${MACHINE_KERNEL_PR}" | 52 | PR = "${MACHINE_KERNEL_PR}" |
53 | 53 | ||
54 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" | 54 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" |
@@ -56,12 +56,11 @@ KERNEL_CONFIG_FRAGMENTS = "${KERNEL_CONFIG_DIR}/audio_display.cfg ${KERNEL_CONFI | |||
56 | ${KERNEL_CONFIG_DIR}/connectivity.cfg ${KERNEL_CONFIG_DIR}/ipc.cfg \ | 56 | ${KERNEL_CONFIG_DIR}/connectivity.cfg ${KERNEL_CONFIG_DIR}/ipc.cfg \ |
57 | ${KERNEL_CONFIG_DIR}/power.cfg ${KERNEL_CONFIG_DIR}/wlan.cfg" | 57 | ${KERNEL_CONFIG_DIR}/power.cfg ${KERNEL_CONFIG_DIR}/wlan.cfg" |
58 | 58 | ||
59 | KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${WORKDIR}/non-smp.cfg" | 59 | KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg" |
60 | KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${WORKDIR}/non-smp.cfg" | 60 | KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg" |
61 | 61 | ||
62 | KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" | 62 | KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" |
63 | KERNEL_GIT_PROTOCOL = "git" | 63 | KERNEL_GIT_PROTOCOL = "git" |
64 | SRC_URI = "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ | 64 | SRC_URI = "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ |
65 | file://defconfig \ | 65 | file://defconfig \ |
66 | file://non-smp.cfg \ | ||
67 | " | 66 | " |