diff options
author | Chase Maupin <Chase.Maupin@ti.com> | 2014-01-17 11:40:21 -0600 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2014-01-17 12:33:42 -0500 |
commit | 5e6aed54ecdb9caa56e91e13b050c616432ac2dc (patch) | |
tree | d8272744885b1965451b82f7e7f451585e8bee54 | |
parent | c27ca998e27e7cbf4ea758ee89c6fdce0dd2ac6a (diff) | |
download | meta-ti-5e6aed54ecdb9caa56e91e13b050c616432ac2dc.tar.gz |
linux-ti-staging: remove initscript dependency
* Remove the RDEPENDS for the am33x-cm3-initscript package since
the latest kernel source use the hotplug functionality to load
the firmware.
* Updated the SRCREV to the latest kernel sources which include
the hotplug fix.
* Bump the MACHINE_KERNEL_PR for the am335x and am437x devices
which are affected.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r-- | conf/machine/include/ti33x.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/ti43x.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.12.bb | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index af340d2c..17b968d8 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -16,7 +16,7 @@ XSERVER = "xserver-xorg \ | |||
16 | GUI_MACHINE_CLASS = "bigscreen" | 16 | GUI_MACHINE_CLASS = "bigscreen" |
17 | 17 | ||
18 | # Increase this everytime you change something in the kernel | 18 | # Increase this everytime you change something in the kernel |
19 | MACHINE_KERNEL_PR = "r20" | 19 | MACHINE_KERNEL_PR = "r21" |
20 | 20 | ||
21 | # Default providers, may need to override for specific machines | 21 | # Default providers, may need to override for specific machines |
22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" | 22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" |
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index d9bfd257..89133804 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc | |||
@@ -16,7 +16,7 @@ XSERVER = "xserver-xorg \ | |||
16 | GUI_MACHINE_CLASS = "bigscreen" | 16 | GUI_MACHINE_CLASS = "bigscreen" |
17 | 17 | ||
18 | # Increase this everytime you change something in the kernel | 18 | # Increase this everytime you change something in the kernel |
19 | MACHINE_KERNEL_PR = "r1" | 19 | MACHINE_KERNEL_PR = "r2" |
20 | 20 | ||
21 | # Default providers, may need to override for specific machines | 21 | # Default providers, may need to override for specific machines |
22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" | 22 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" |
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb index 7d5439e9..2d9f8137 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.12.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb | |||
@@ -13,8 +13,8 @@ RDEPENDS_kernel-base += "kernel-devicetree" | |||
13 | 13 | ||
14 | # Add a run-time dependency for the PM firmware to be installed | 14 | # Add a run-time dependency for the PM firmware to be installed |
15 | # on the target file system. | 15 | # on the target file system. |
16 | RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript" | 16 | RDEPENDS_kernel-base_append_ti33x = " am33x-cm3" |
17 | RDEPENDS_kernel-base_append_ti43x = " am33x-cm3 am33x-cm3-initscript" | 17 | RDEPENDS_kernel-base_append_ti43x = " am33x-cm3" |
18 | 18 | ||
19 | # Add a run-time dependency for the VPE VPDMA firmware to be installed | 19 | # Add a run-time dependency for the VPE VPDMA firmware to be installed |
20 | # on the target file system. | 20 | # on the target file system. |
@@ -36,8 +36,7 @@ S = "${WORKDIR}/git" | |||
36 | 36 | ||
37 | BRANCH = "ti-linux-3.12.y" | 37 | BRANCH = "ti-linux-3.12.y" |
38 | 38 | ||
39 | # Corresponds to ti2013.12.00 release | 39 | SRCREV = "b0f3ccd18d39c375491519ba285babf152eab9d8" |
40 | SRCREV = "dfea149efb32485f17bb7440eb326549c8f647e2" | ||
41 | PV = "3.12.4" | 40 | PV = "3.12.4" |
42 | 41 | ||
43 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 42 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |