[linux-yocto] [PATCH 2/2] pch_uart: add sysrq support
When send break to the uart port, we always get 'frame error', but we
can not just reset receive fifo in such case, otherwise the sysrq cmd
will not be received correctly.
When we handle sysrq output via pch_console_write, the priv lock has
already been taken so no need to take the lock in pch_console_write.
Signed-off-by: Liang Li
---
drivers/tty/serial/pch_uart.c | 27 +++
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 2e99f79..f2d67df 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -14,18 +14,21 @@
*along with this program; if not, write to the Free Software
*Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#if defined(CONFIG_SERIAL_PCH_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
#include
#include
#include
#include
#include
+#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
@@ -552,12 +555,24 @@ static int pch_uart_hal_read(struct eg20t_port *priv,
unsigned char *buf,
{
int i;
u8 rbr, lsr;
+ struct uart_port *port = &priv->port;
lsr = ioread8(priv->membase + UART_LSR);
for (i = 0, lsr = ioread8(priv->membase + UART_LSR);
-i < rx_size && lsr & UART_LSR_DR;
+i < rx_size && lsr & (UART_LSR_DR | UART_LSR_BI);
lsr = ioread8(priv->membase + UART_LSR)) {
rbr = ioread8(priv->membase + PCH_UART_RBR);
+
+ if (lsr & UART_LSR_BI) {
+ port->icount.brk++;
+ if (uart_handle_break(port))
+ continue;
+ }
+ if (port->sysrq) {
+ if (uart_handle_sysrq_char(port, rbr))
+ continue;
+ }
+
buf[i++] = rbr;
}
return i;
@@ -1033,16 +1048,11 @@ static unsigned int dma_handle_tx(struct eg20t_port
*priv)
static void pch_uart_err_ir(struct eg20t_port *priv, unsigned int lsr)
{
- u8 fcr = ioread8(priv->membase + UART_FCR);
struct uart_port *port = &priv->port;
struct tty_struct *tty = tty_port_tty_get(&port->state->port);
char *error_msg[5] = {};
inti = 0;
- /* Reset FIFO */
- fcr |= UART_FCR_CLEAR_RCVR;
- iowrite8(fcr, priv->membase + UART_FCR);
-
if (lsr & PCH_UART_LSR_ERR)
error_msg[i++] = "Error data in FIFO\n";
@@ -1568,7 +1578,8 @@ pch_console_write(struct console *co, const char *s,
unsigned int count)
local_irq_save(flags);
if (priv->port.sysrq) {
- spin_lock(&priv->lock);
+ /* call to uart_handle_sysrq_char already took the priv lock */
+ priv_locked = 0;
/* serial8250_handle_port() already took the port lock */
port_locked = 0;
} else if (oops_in_progress) {
--
1.7.11.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 1/2] pch_uart: fix a deadlock when pch_uart as console
When we use pch_uart as system console like 'console=ttyPCH0,115200',
then 'send break' to it. We'll encounter the deadlock on a cpu/core,
with interrupts disabled on the core. When we happen to have all irqs
affinity to cpu0 then the deadlock on cpu0 actually deadlock whole
system.
In pch_uart_interrupt, we have spin_lock_irqsave(&priv->lock, flags)
then call pch_uart_err_ir when break is received. Then the call to
dev_err would actually call to pch_console_write then we'll run into
another spin_lock(&priv->lock), with interrupts disabled.
So in the call sequence lead by pch_uart_interrupt, we should be
carefully to call functions that will 'print message to console' only
in case the uart port is not being used as serial console.
Signed-off-by: Liang Li
---
drivers/tty/serial/pch_uart.c | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 7d47514..2e99f79 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1034,22 +1034,37 @@ static unsigned int dma_handle_tx(struct eg20t_port
*priv)
static void pch_uart_err_ir(struct eg20t_port *priv, unsigned int lsr)
{
u8 fcr = ioread8(priv->membase + UART_FCR);
+ struct uart_port *port = &priv->port;
+ struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+ char *error_msg[5] = {};
+ inti = 0;
/* Reset FIFO */
fcr |= UART_FCR_CLEAR_RCVR;
iowrite8(fcr, priv->membase + UART_FCR);
if (lsr & PCH_UART_LSR_ERR)
- dev_err(&priv->pdev->dev, "Error data in FIFO\n");
+ error_msg[i++] = "Error data in FIFO\n";
- if (lsr & UART_LSR_FE)
- dev_err(&priv->pdev->dev, "Framing Error\n");
+ if (lsr & UART_LSR_FE) {
+ port->icount.frame++;
+ error_msg[i++] = " Framing Error\n";
+ }
- if (lsr & UART_LSR_PE)
- dev_err(&priv->pdev->dev, "Parity Error\n");
+ if (lsr & UART_LSR_PE) {
+ port->icount.parity++;
+ error_msg[i++] = " Parity Error\n";
+ }
- if (lsr & UART_LSR_OE)
- dev_err(&priv->pdev->dev, "Overrun Error\n");
+ if (lsr & UART_LSR_OE) {
+ port->icount.overrun++;
+ error_msg[i++] = " Overrun Error\n";
+ }
+
+ if (tty == NULL) {
+ for (i = 0; error_msg[i] != NULL; i++)
+ dev_err(&priv->pdev->dev, error_msg[i]);
+ }
}
static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
--
1.7.11.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 0/2] pch_uart: fix a deadlock and add sysrq support
Patch 1/2 is fixing a deadlock issue caused by serial error when using pch_uart as serial console. Send brk to serial console can be used to reproduce the issue. Patch 2/2 is adding sysrq support for pch_uart. Diffstat: drivers/tty/serial/pch_uart.c | 56 ++ 1 file changed, 41 insertions(+), 15 deletions(-) --- Thanks, Liang Li ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 1/7] kernel-yocto: remove unnecessary non-bare warning
In the past working from a non-bare clone would cause problems,
due to branches not existing in the WORKDIR clone. This hasn't
been true for some time, since the routines which convert remotes
into local branches have been functioning without problems.
So we no longer need the warning and it can be removed.
Signed-off-by: Bruce Ashfield
---
meta/classes/kernel-yocto.bbclass |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index c74317e..99b3a46 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -120,15 +120,11 @@ do_kernel_checkout() {
# A linux yocto SRC_URI should use the bareclone option. That
# ensures that all the branches are available in the WORKDIR version
- # of the repository. If it wasn't passed, we should detect it, and put
- # out a useful error message
+ # of the repository.
if [ -d "${WORKDIR}/git/" ] && [ -d "${WORKDIR}/git/.git" ]; then
# we build out of {S}, so ensure that ${S} is clean and present
rm -rf ${S}
mkdir -p ${S}
-
- echo "WARNING. ${WORKDIR}/git is not a bare clone."
- echo "Ensure that the SRC_URI includes the 'bareclone=1'
option."
# We can fix up the kernel repository even if it wasn't a bare
clone.
# If KMETA is defined, the branch must exist, but a machine
branch
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 7/7] guilt: add git 1.8.x support
Updating guilt to allow git 1.8.x as a supported version. This version has
no impact on other functionality within the scripts, so no other adjustments
are necessary.
[YOCTO #3275]
Signed-off-by: Bruce Ashfield
---
...lt-update-supported-git-versions-to-1.8.x.patch | 28
meta/recipes-devtools/guilt/guilt-native_0.33.bb |3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
diff --git
a/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
new file mode 100644
index 000..579d9bc
--- /dev/null
+++
b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
@@ -0,0 +1,28 @@
+From d7fb5d4e159071b6255181fcf436300038fe9e6c Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield
+Date: Wed, 16 Jan 2013 20:48:11 -0500
+Subject: [PATCH] guilt: update supported git versions to 1.8.x
+
+guilt errors on the new 1.8.x git series, when it shouldn't, since
+1.8.x works fine with the existing guilt version.
+
+Signed-off-by: Bruce Ashfield
+---
+ guilt |1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/guilt b/guilt
+index 346f929..6505653 100755
+--- a/guilt
b/guilt
+@@ -37,6 +37,7 @@ case "$gitver" in
+ 1.5.*) ;; # git config
+ 1.6.*) ;; # git config
+ 1.7.*) ;; # git config
++ 1.8.*) ;; # git config
+ *) die "Unsupported version of git ($gitver)" ;;
+ esac
+
+--
+1.7.10.4
+
diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
index 754b528..6652ab6 100644
--- a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135"
PV = "0.33"
-PR = "r2"
+PR = "r3"
inherit native
@@ -20,6 +20,7 @@ SRC_URI =
"http://ftp.de.debian.org/debian/pool/main/g/guilt/guilt_${PV}.orig.ta
file://improve_auto_header_gen.patch \
file://guilt-set-git_exec_path.patch \
file://guilt-bash.patch \
+ file://guilt-update-supported-git-versions-to-1.8.x.patch \
file://optional_head_check.patch"
SRC_URI[md5sum] = "d800c5e0743d90543ef51d797a626e09"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 4/7] linux-yocto/meta: update include statements to explicit .scc format
The kernel tooling can support a "shorthand" method of including other features
that doesn't require the full filename ending in .scc. This format is confusing
when compared to the source tree, and is inconsitently use. This commit updates
all shorthand includes to a full "include .scc" format.
[YOCTO #3418]
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.4.bb |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 93adb06..2674090 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -10,7 +10,7 @@ KMETA = "meta"
SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001"
SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448"
-SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
+SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 80a1ecb..083cdf5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.24"
KMETA = "meta"
SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
+SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index b7a2472..35f0074 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?=
"1c8a1aa8cc839f0328edbfe0d755100368bc4ae6"
SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
+SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 0/7] kernel-yocto/tools: consolidated pull request
Richard/Saul,
Here's a collection of bug fixes and changes that I was able to get ready
and be comfortable with for 1.4 M3. The series contains some minor tweaks,
some configuration updates, minor tools updates and the introduction of
LTSI 3.4 content to the linux-yocto-3.4 tree (and BSPs).
Here's the breakdown of the changes:
[PATCH 1/7] kernel-yocto: remove unnecessary non-bare warning
In the past working from a non-bare clone would cause problems,
due to branches not existing in the WORKDIR clone. This hasn't
been true for some time, since the routines which convert remotes
into local branches have been functioning without problems.
So we no longer need the warning and it can be removed.
This cleans up the output and removes a potentially alarming warning ..
that shouldn't be alarming anymore.
[PATCH 2/7] linux-yocto: normalize repository naming and SRC_URI options
linux-yocto-tiny and linux-yocto had minor differences from the rest
of the linux-yocto recipes. After this commit, all the recipes are
using bareclone=1 and repository names that end with .git.
[PATCH 3/7] kernel-yocto: add KBUILD_OUTPUT to OE_TERMINAL_EXPORTS
Since linux-yocto based recipes have a split build and source directory,
we should export KBUILD=${B} to the devshell. This allows the kernel to
be incrementally build within the shell and not dirty the source
directory (which breaks subsequent full builds).
This was discussed on the mailing lists in December and has been working
locally for me ever since.
[PATCH 4/7] linux-yocto/meta: update include statements to explicit .scc format
The kernel tooling can support a "shorthand" method of including other
features
that doesn't require the full filename ending in .scc. This format is
confusing
when compared to the source tree, and is inconsitently use. This commit
updates
all shorthand includes to a full "include .scc" format.
This addresses [YOCTO #3418].
[PATCH 5/7] linux-yocto/routerstationpro: enable GPIO_SYSFS
We had a request to enable GPIO_SYSFS to allow easy use of the available
GPIOs in the board out of the box. This is a simple / contained config item
to enable, so there's no reason not to.
This addresses [YOCTO #3519]
[PATCH 6/7] linux-yocto/3.4: integrate LTSI-3.4
Updating the linux-yocto-3.4 SRCREVS to activate the merge of the 3.4.25-ltsi
tree:
http://git.linuxfoundation.org/?p=ltsi-kernel.git;a=tag;h=refs/tags/v3.4.25-ltsi
The pristine patch queue can be seen on the "ltsi" branch in the repository.
This branch has been merged into the standard/base branch of linux-yocto-3.4
and to all BSP branches in the tree.
LTSI based BSPs or features are not activated as part of this commit, they
are controlled by the meta branch of the kernel repository and are activated
in separate patches.
This addresses [YOCTO #2396].
Notes:
- I've built and booted standard and preempt-rt qemu BSPs for all archs
- I've built the hardware reference BSPs
- I've built selected meta-intel BSPs
- There may be some fallout from this, but the changes look good and are
largely orthogonal to the rest of the changes in the tree. This makes
the significant source changes for M3, and I'll follow up shortly with
a ltsi feature fragment and kernel type for pure-ltsi based testing.
[PATCH 7/7] guilt: add git 1.8.x support
Updating guilt to allow git 1.8.x as a supported version. This version has
no impact on other functionality within the scripts, so no other adjustments
are necessary.
This addresses [YOCTO #3275]
Cheers,
Bruce
The following changes since commit 3db277b18b8923daca545aa53bcfbbe9d43d3baa:
update-rc.d: fix failure on target (2013-01-17 20:16:46 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (7):
kernel-yocto: remove unnecessary non-bare warning
linux-yocto: normalize repository naming and SRC_URI options
kernel-yocto: add KBUILD_OUTPUT to OE_TERMINAL_EXPORTS
linux-yocto/meta: update include statements to explicit .scc format
linux-yocto/routerstationpro: enable GPIO_SYSFS
linux-yocto/3.4: integrate LTSI-3.4
guilt: add git 1.8.x support
meta/classes/kernel-yocto.bbclass |9 +++
...lt-update-supported-git-versions-to-1.8.x.patch | 28
meta/recipes-devtools/guilt/guilt-native_0.33.bb |3 ++-
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb|6 ++---
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |6 ++---
meta/recipes-kernel/linux/linux-yocto_3.4.bb | 18 ++---
6 files changed, 48 insertions(+), 22 deletions(-)
create mode 100644
meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
--
1.7.10.4
___
linux-yocto mailing list
linux-yoc
[linux-yocto] [PATCH 5/7] linux-yocto/routerstationpro: enable GPIO_SYSFS
We had a request to enable GPIO_SYSFS to allow easy use of the available
GPIOs in the board out of the box. This is a simple / contained config item
to enable, so there's no reason not to.
[YOCTO #3519]
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.4.bb |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 2674090..bcac395 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -10,7 +10,7 @@ KMETA = "meta"
SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001"
SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448"
-SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
+SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 083cdf5..984476f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.24"
KMETA = "meta"
SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
+SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 35f0074..0ac51b9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?=
"1c8a1aa8cc839f0328edbfe0d755100368bc4ae6"
SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_meta ?= "d9646442b3763097a425c4e728525685bafc4b89"
+SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 6/7] linux-yocto/3.4: integrate LTSI-3.4
Updating the linux-yocto-3.4 SRCREVS to activate the merge of the 3.4.25-ltsi
tree:
http://git.linuxfoundation.org/?p=ltsi-kernel.git;a=tag;h=refs/tags/v3.4.25-ltsi
The pristine patch queue can be seen on the "ltsi" branch in the repository.
This branch has been merged into the standard/base branch of linux-yocto-3.4
and to all BSP branches in the tree.
LTSI based BSPs or features are not activated as part of this commit, they
are controlled by the meta branch of the kernel repository and are activated
in separate patches.
[YOCTO #2396]
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |4 ++--
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.4.bb | 12 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index bcac395..25e9a10 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
KMETA = "meta"
-SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001"
-SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448"
+SRCREV_machine ?= "086782fe576d96cda54068a2248c697a9f1946c6"
+SRCREV_machine_qemuppc ?= "4a3d7cbda063ece64ba286749e23bfd4b81831b8"
SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 984476f..17eb6dd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.24"
KMETA = "meta"
-SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 0ac51b9..62eb4be 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
KBRANCH_DEFAULT = "standard/base"
KBRANCH = "${KBRANCH_DEFAULT}"
-SRCREV_machine_qemuarm ?= "50986c7d971c28505acdbdcab6601f4d5b6dbff4"
-SRCREV_machine_qemumips ?= "4d355c57fe0d9f117c272f1679fa3d3f451a8c8e"
-SRCREV_machine_qemuppc ?= "1c8a1aa8cc839f0328edbfe0d755100368bc4ae6"
-SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
-SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_machine_qemuarm ?= "2ed05c280920e592f62d09bda15ab006baffa996"
+SRCREV_machine_qemumips ?= "81ef4ad8f02c979a236a460c6831dcb4fbf2ef3c"
+SRCREV_machine_qemuppc ?= "6b5d5a60ca6c3cf05d28c9ad447c133563340232"
+SRCREV_machine_qemux86 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
+SRCREV_machine_qemux86-64 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
+SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 2/7] linux-yocto: normalize repository naming and SRC_URI options
linux-yocto-tiny and linux-yocto had minor differences from the rest
of the linux-yocto recipes. After this commit, all the recipes are
using bareclone=1 and repository names that end with .git.
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.4.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 5a4959e..80a1ecb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -18,7 +18,7 @@ SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
COMPATIBLE_MACHINE = "(qemux86)"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 70ed967..b7a2472 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -11,7 +11,7 @@ SRCREV_machine_qemux86-64 ?=
"5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
LINUX_VERSION ?= "3.4.24"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH 3/7] kernel-yocto: add KBUILD_OUTPUT to OE_TERMINAL_EXPORTS
Since linux-yocto based recipes have a split build and source directory,
we should export KBUILD=${B} to the devshell. This allows the kernel to
be incrementally build within the shell and not dirty the source
directory (which breaks subsequent full builds).
Signed-off-by: Bruce Ashfield
---
meta/classes/kernel-yocto.bbclass |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index 99b3a46..aaee441 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -340,5 +340,6 @@ do_kernel_link_vmlinux() {
ln -sf ../../../vmlinux
}
-OE_TERMINAL_EXPORTS += "GUILT_BASE"
+OE_TERMINAL_EXPORTS += "GUILT_BASE KBUILD_OUTPUT"
GUILT_BASE = "meta"
+KBUILD_OUTPUT = "${B}"
--
1.7.10.4
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 01/12] meta: relocate git-merge of emgd branch
> -Original Message- > From: Zanussi, Tom > Sent: Thursday, January 17, 2013 1:55 PM > To: Kamble, Nitin A > Cc: bruce.ashfi...@windriver.com; Hart, Darren; linux- > yo...@yoctoproject.org > Subject: Re: [meta branch v3 01/12] meta: relocate git-merge of emgd > branch > > On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > > From: Nitin A Kamble > > > > Move git-merge of emgd branch out from the bsp area and into the > > features area > > > > Just a minor nit - can you please proofread for obvious typos like below > before submitting? Thanks Tom for catching this, and sorry for I missing these typos. I have corrected these from all the commit messages on the contrib branch. Nitin > > > This change avoids getting emged sources unnecessarily included in the > > ^ > > > noemgd bsp kernel sources. > > > > This addresses this bug/feature rquest: > > ^^ > > Thanks, > > Tom > > > [YOCTO #2268] > > > > Signed-off-by: Nitin A Kamble > > --- > > .../bsp/crownbay/crownbay-standard.scc |2 -- > > .../kernel-cache/bsp/emenlow/emenlow-standard.scc |2 -- > > meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |2 -- > > .../kernel-cache/bsp/sys940x/sys940x-standard.scc |2 -- > > .../kernel-cache/features/drm-emgd/drm-emgd.scc|1 + > > 5 files changed, 1 insertions(+), 8 deletions(-) > > > > diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > index 3db03de..9fe4776 100644 > > --- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch crownbay > > > > -git merge emgd-1.14 > > - > > include crownbay.scc > > > > # default policy for standard kernels diff --git > > a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > index a2094ef..3526a18 100644 > > --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch emenlow > > > > -git merge emgd-1.14 > > - > > include emenlow.scc > > > > # default policy for standard kernels diff --git > > a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > index fc47a2e..029eafa 100644 > > --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch fri2 > > > > -git merge emgd-1.14 > > - > > include fri2.scc > > > > # Extra fri2 configs above the minimal defined in fri2.scc diff --git > > a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > index 3149a3e..7b21cbc 100644 > > --- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch sys940x > > > > -git merge emgd-1.14 > > - > > include sys940x.scc > > include cfg/efi-ext.scc > > > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > index 672ee2e..01bcec8 100644 > > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > @@ -1 +1,2 @@ > > kconf hardware drm-emgd.cfg > > +git merge emgd-1.14 > ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 02/12] meta: drm-emgd.cfg: add configs for dependent routines
On Thu, 2013-01-17 at 16:19 -0600, Kamble, Nitin A wrote: > > > -Original Message- > > From: Zanussi, Tom > > Sent: Thursday, January 17, 2013 1:49 PM > > To: Kamble, Nitin A > > Cc: bruce.ashfi...@windriver.com; Hart, Darren; linux- > > yo...@yoctoproject.org > > Subject: Re: [meta branch v3 02/12] meta: drm-emgd.cfg: add configs for > > dependent routines > > > > On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > > > From: Nitin A Kamble > > > > > > emgd driver utilizes common frame buffer routines to implement some of > > > the tasks. Making sure these routines are turned on in the kernel > > > config when emgd is selected. > > > > > > This commit avoids these kind of kernel build errors. > > > > > > | ERROR: "cfb_fillrect" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > > | ERROR: "cfb_imageblit" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > > | ERROR: "cfb_copyarea" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > > > > > > Were you hitting these errors? I haven't seen them before. > > > > I guess this new set is a copy of a block from drm-psb.cfg, where IIRC I did > > see them - should we make that a common fragment instead of having > > multiple copies? > > This errors show up when emgd driver is enabled without vesafb in the kernel > config. Earlier > vesafb was satisfying these dependencies for emgd driver. Now emgd is > configured without vesafb. > Right, I got them from the drm-psb.cfg. I see other graphics config > fragments > include some of these too. So it is possible to move them in a common > fragment, but with the > current workload I think this cleanup will lower priority. > Yeah, that's fine - just wanted to point it out as something probably worth doing and so it didn't go unnoticed. > > > > Also, I guess we don't use the psb stuff any more - should we remove drm- > > psb? > I also see no need of the psb config fragment now. I think Bruce would know > better if it can be > dumped now. May be all these cleanup can be done as part of moving > to the next kernel version repo. That way we will be doing it more > efficiently. > Sure, whatever makes sense... Tom > Thanks, > Nitin > > > > > Tom > > > > > > And the I2C config bits are added to better support detection of modes > > > on the monitors. > > > > > > Signed-off-by: Nitin A Kamble > > > --- > > > .../kernel-cache/features/drm-emgd/drm-emgd.cfg| 13 > > + > > > 1 files changed, 13 insertions(+), 0 deletions(-) > > > > > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > > index cb9558d..001460e2 100644 > > > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > > @@ -1,3 +1,16 @@ > > > CONFIG_DRM=y > > > CONFIG_DRM_EGD=m > > > CONFIG_DRM_KMS_HELPER=m > > > + > > > +CONFIG_I2C=y > > > +CONFIG_VIDEO_V4L2=y > > > +CONFIG_VIDEO_IVTV=y > > > +CONFIG_MEDIA_SUPPORT=y > > > +CONFIG_VIDEO_CAPTURE_DRIVERS=y > > > +CONFIG_VIDEO_DEV=y > > > +CONFIG_VIDEO_V4L2_COMMON=y > > > +CONFIG_I2C_ALGOBIT=y > > > +CONFIG_FB_CFB_COPYAREA=y > > > +CONFIG_FB_CFB_IMAGEBLIT=y > > > +CONFIG_FB_CFB_FILLRECT=y > > > +CONFIG_VIDEO_FB_IVTV=y > > > ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 02/12] meta: drm-emgd.cfg: add configs for dependent routines
> -Original Message- > From: Zanussi, Tom > Sent: Thursday, January 17, 2013 1:49 PM > To: Kamble, Nitin A > Cc: bruce.ashfi...@windriver.com; Hart, Darren; linux- > yo...@yoctoproject.org > Subject: Re: [meta branch v3 02/12] meta: drm-emgd.cfg: add configs for > dependent routines > > On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > > From: Nitin A Kamble > > > > emgd driver utilizes common frame buffer routines to implement some of > > the tasks. Making sure these routines are turned on in the kernel > > config when emgd is selected. > > > > This commit avoids these kind of kernel build errors. > > > > | ERROR: "cfb_fillrect" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > | ERROR: "cfb_imageblit" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > | ERROR: "cfb_copyarea" [drivers/gpu/drm/emgd/emgd.ko] undefined! > > > > Were you hitting these errors? I haven't seen them before. > > I guess this new set is a copy of a block from drm-psb.cfg, where IIRC I did > see them - should we make that a common fragment instead of having > multiple copies? This errors show up when emgd driver is enabled without vesafb in the kernel config. Earlier vesafb was satisfying these dependencies for emgd driver. Now emgd is configured without vesafb. Right, I got them from the drm-psb.cfg. I see other graphics config fragments include some of these too. So it is possible to move them in a common fragment, but with the current workload I think this cleanup will lower priority. > > Also, I guess we don't use the psb stuff any more - should we remove drm- > psb? I also see no need of the psb config fragment now. I think Bruce would know better if it can be dumped now. May be all these cleanup can be done as part of moving to the next kernel version repo. That way we will be doing it more efficiently. Thanks, Nitin > > Tom > > > And the I2C config bits are added to better support detection of modes > > on the monitors. > > > > Signed-off-by: Nitin A Kamble > > --- > > .../kernel-cache/features/drm-emgd/drm-emgd.cfg| 13 > + > > 1 files changed, 13 insertions(+), 0 deletions(-) > > > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > index cb9558d..001460e2 100644 > > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > > @@ -1,3 +1,16 @@ > > CONFIG_DRM=y > > CONFIG_DRM_EGD=m > > CONFIG_DRM_KMS_HELPER=m > > + > > +CONFIG_I2C=y > > +CONFIG_VIDEO_V4L2=y > > +CONFIG_VIDEO_IVTV=y > > +CONFIG_MEDIA_SUPPORT=y > > +CONFIG_VIDEO_CAPTURE_DRIVERS=y > > +CONFIG_VIDEO_DEV=y > > +CONFIG_VIDEO_V4L2_COMMON=y > > +CONFIG_I2C_ALGOBIT=y > > +CONFIG_FB_CFB_COPYAREA=y > > +CONFIG_FB_CFB_IMAGEBLIT=y > > +CONFIG_FB_CFB_FILLRECT=y > > +CONFIG_VIDEO_FB_IVTV=y > ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 01/12] meta: relocate git-merge of emgd branch
On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > From: Nitin A Kamble > > Move git-merge of emgd branch out from the bsp area and into the features area > Just a minor nit - can you please proofread for obvious typos like below before submitting? > This change avoids getting emged sources unnecessarily included in the ^ > noemgd bsp kernel sources. > > This addresses this bug/feature rquest: ^^ Thanks, Tom > [YOCTO #2268] > > Signed-off-by: Nitin A Kamble > --- > .../bsp/crownbay/crownbay-standard.scc |2 -- > .../kernel-cache/bsp/emenlow/emenlow-standard.scc |2 -- > meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |2 -- > .../kernel-cache/bsp/sys940x/sys940x-standard.scc |2 -- > .../kernel-cache/features/drm-emgd/drm-emgd.scc|1 + > 5 files changed, 1 insertions(+), 8 deletions(-) > > diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > index 3db03de..9fe4776 100644 > --- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > +++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > @@ -5,8 +5,6 @@ define KARCH i386 > include ktypes/standard > branch crownbay > > -git merge emgd-1.14 > - > include crownbay.scc > > # default policy for standard kernels > diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > index a2094ef..3526a18 100644 > --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > @@ -5,8 +5,6 @@ define KARCH i386 > include ktypes/standard > branch emenlow > > -git merge emgd-1.14 > - > include emenlow.scc > > # default policy for standard kernels > diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > index fc47a2e..029eafa 100644 > --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > @@ -5,8 +5,6 @@ define KARCH i386 > include ktypes/standard > branch fri2 > > -git merge emgd-1.14 > - > include fri2.scc > > # Extra fri2 configs above the minimal defined in fri2.scc > diff --git a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > index 3149a3e..7b21cbc 100644 > --- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > +++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > @@ -5,8 +5,6 @@ define KARCH i386 > include ktypes/standard > branch sys940x > > -git merge emgd-1.14 > - > include sys940x.scc > include cfg/efi-ext.scc > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > index 672ee2e..01bcec8 100644 > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > @@ -1 +1,2 @@ > kconf hardware drm-emgd.cfg > +git merge emgd-1.14 ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 02/12] meta: drm-emgd.cfg: add configs for dependent routines
On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > From: Nitin A Kamble > > emgd driver utilizes common frame buffer routines to implement some > of the tasks. Making sure these routines are turned on in the kernel > config when emgd is selected. > > This commit avoids these kind of kernel build errors. > > | ERROR: "cfb_fillrect" [drivers/gpu/drm/emgd/emgd.ko] undefined! > | ERROR: "cfb_imageblit" [drivers/gpu/drm/emgd/emgd.ko] undefined! > | ERROR: "cfb_copyarea" [drivers/gpu/drm/emgd/emgd.ko] undefined! > Were you hitting these errors? I haven't seen them before. I guess this new set is a copy of a block from drm-psb.cfg, where IIRC I did see them - should we make that a common fragment instead of having multiple copies? Also, I guess we don't use the psb stuff any more - should we remove drm-psb? Tom > And the I2C config bits are added to better support detection of modes > on the monitors. > > Signed-off-by: Nitin A Kamble > --- > .../kernel-cache/features/drm-emgd/drm-emgd.cfg| 13 + > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > index cb9558d..001460e2 100644 > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.cfg > @@ -1,3 +1,16 @@ > CONFIG_DRM=y > CONFIG_DRM_EGD=m > CONFIG_DRM_KMS_HELPER=m > + > +CONFIG_I2C=y > +CONFIG_VIDEO_V4L2=y > +CONFIG_VIDEO_IVTV=y > +CONFIG_MEDIA_SUPPORT=y > +CONFIG_VIDEO_CAPTURE_DRIVERS=y > +CONFIG_VIDEO_DEV=y > +CONFIG_VIDEO_V4L2_COMMON=y > +CONFIG_I2C_ALGOBIT=y > +CONFIG_FB_CFB_COPYAREA=y > +CONFIG_FB_CFB_IMAGEBLIT=y > +CONFIG_FB_CFB_FILLRECT=y > +CONFIG_VIDEO_FB_IVTV=y ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 00/12] misc commits for meta branch
> -Original Message- > From: Bruce Ashfield [mailto:bruce.ashfi...@windriver.com] > Sent: Thursday, January 17, 2013 6:19 AM > To: Kamble, Nitin A > Cc: Zanussi, Tom; Hart, Darren; linux-yocto@yoctoproject.org > Subject: Re: [meta branch v3 00/12] misc commits for meta branch > > On 13-01-16 02:23 PM, nitin.a.kam...@intel.com wrote: > > From: Nitin A Kamble > > > > These commits enable selection of kernel graphics drivers (emgd & > > vesa) from the kernel recipe space by using kernel features variable. > > > > And config fragment for gma500/gma600 graphics driver feature is also > > added, which can be used with emenlow-noemgd BSP. > > FYI: I'm staging these changes here. I have two other yocto bugs/merges that > need to be in place when I do a few local tests (ltsi, git merge wrapping). > Those changes are done, but I need to do some extra build testing with them > today. So this may take another day (or two) to show up in the tree itself. > > Cheers, > > Bruce Thanks for the update Bruce, Nitin > > > > > Thanks, > > Nitin > > > > The following changes since commit > 7e0cd2990798aae80565baa17d3b6c771874f284: > > > >meta: bump kver to v3.4.24 (2012-12-18 11:31:37 -0500) > > > > are available in the git repository at: > >git://git.yoctoproject.org/linux-yocto-2.6.37-contrib nitin/meta > > > > http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h > > =nitin/meta > > > > Nitin A Kamble (12): > >meta: relocate git-merge of emgd branch > >meta: drm-emgd.cfg: add configs for dependent routines > >meta: crownbay: remove emgd config from bsp config > >meta: crownbay: drop vesa fragment from bsp config > >meta: emenlow: remove emgd config from bsp config > >meta: emenlow: drop vesa fragment from bsp config > >meta: fri2: remove emgd config from bsp config > >meta: fri2: drop vesa fragment from bsp config > >meta: sys940x: remove emgd config from bsp config > >meta: sys940x: drop vesa fragment from bsp config > >meta: add config fragment for gma500 graphics driver > >meta: add config fragment for gma600 graphics driver > > > > .../bsp/crownbay/crownbay-standard.scc |2 -- > > meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc|2 -- > > .../kernel-cache/bsp/emenlow/emenlow-standard.scc |2 -- > > meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc |2 -- > > meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |4 > > .../kernel-cache/bsp/sys940x/sys940x-standard.scc |2 -- > > meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc |2 -- > > .../kernel-cache/features/drm-emgd/drm-emgd.cfg| 13 > + > > .../kernel-cache/features/drm-emgd/drm-emgd.scc|1 + > > .../features/drm-gma500/drm-gma500.cfg |3 +++ > > .../features/drm-gma500/drm-gma500.scc |1 + > > .../features/drm-gma500/drm-gma600.cfg |1 + > > .../features/drm-gma500/drm-gma600.scc |3 +++ > > 13 files changed, 22 insertions(+), 16 deletions(-) > > create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm- > gma500.cfg > > create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm- > gma500.scc > > create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm- > gma600.cfg > > create mode 100644 > > meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc > > ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [meta branch v3 00/12] misc commits for meta branch
On 13-01-16 02:23 PM, nitin.a.kam...@intel.com wrote: From: Nitin A Kamble These commits enable selection of kernel graphics drivers (emgd & vesa) from the kernel recipe space by using kernel features variable. And config fragment for gma500/gma600 graphics driver feature is also added, which can be used with emenlow-noemgd BSP. FYI: I'm staging these changes here. I have two other yocto bugs/merges that need to be in place when I do a few local tests (ltsi, git merge wrapping). Those changes are done, but I need to do some extra build testing with them today. So this may take another day (or two) to show up in the tree itself. Cheers, Bruce Thanks, Nitin The following changes since commit 7e0cd2990798aae80565baa17d3b6c771874f284: meta: bump kver to v3.4.24 (2012-12-18 11:31:37 -0500) are available in the git repository at: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib nitin/meta http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=nitin/meta Nitin A Kamble (12): meta: relocate git-merge of emgd branch meta: drm-emgd.cfg: add configs for dependent routines meta: crownbay: remove emgd config from bsp config meta: crownbay: drop vesa fragment from bsp config meta: emenlow: remove emgd config from bsp config meta: emenlow: drop vesa fragment from bsp config meta: fri2: remove emgd config from bsp config meta: fri2: drop vesa fragment from bsp config meta: sys940x: remove emgd config from bsp config meta: sys940x: drop vesa fragment from bsp config meta: add config fragment for gma500 graphics driver meta: add config fragment for gma600 graphics driver .../bsp/crownbay/crownbay-standard.scc |2 -- meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc|2 -- .../kernel-cache/bsp/emenlow/emenlow-standard.scc |2 -- meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc |2 -- meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |4 .../kernel-cache/bsp/sys940x/sys940x-standard.scc |2 -- meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc |2 -- .../kernel-cache/features/drm-emgd/drm-emgd.cfg| 13 + .../kernel-cache/features/drm-emgd/drm-emgd.scc|1 + .../features/drm-gma500/drm-gma500.cfg |3 +++ .../features/drm-gma500/drm-gma500.scc |1 + .../features/drm-gma500/drm-gma600.cfg |1 + .../features/drm-gma500/drm-gma600.scc |3 +++ 13 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.scc create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg create mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
