summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-10-08 06:17:12 +0000
committerDenys Dmytriyenko <denys@ti.com>2014-10-07 20:49:58 -0400
commite8df8ef878c357792d269f60b00e7adcffc61365 (patch)
tree91ea17301897056996906f11a7b59e25a05b3025
parent51621f90c114ee335a1ef29cc49968416ddf35a4 (diff)
downloadmeta-ti-e8df8ef878c357792d269f60b00e7adcffc61365.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>
-rw-r--r--recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg5
-rw-r--r--recipes-kernel/linux/linux-ti-staging_3.14.bb9
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##################################################
4CONFIG_SMP=n
5CONFIG_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
45BRANCH = "ti-linux-3.14.y" 45BRANCH = "ti-linux-3.14.y"
46 46
47SRCREV = "f56742085ff39d6aa7f487c14a6abff473b4b810" 47SRCREV = "bdbce705b538fb18116afbcf62a59d2fb602de5e"
48PV = "3.14.19" 48PV = "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
51MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" 51MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}"
52PR = "${MACHINE_KERNEL_PR}" 52PR = "${MACHINE_KERNEL_PR}"
53 53
54KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" 54KERNEL_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
59KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${WORKDIR}/non-smp.cfg" 59KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
60KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${WORKDIR}/non-smp.cfg" 60KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
61 61
62KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" 62KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
63KERNEL_GIT_PROTOCOL = "git" 63KERNEL_GIT_PROTOCOL = "git"
64SRC_URI = "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 64SRC_URI = "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
65 file://defconfig \ 65 file://defconfig \
66 file://non-smp.cfg \
67 " 66 "