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 nitin.a.kam...@intel.com 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 nitin.a.kam...@intel.com --- .../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 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 nitin.a.kam...@intel.com 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 nitin.a.kam...@intel.com --- .../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
[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 bruce.ashfi...@windriver.com
---
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 bruce.ashfi...@windriver.com
---
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 bruce.ashfi...@windriver.com
---
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
[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 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 liang...@windriver.com
---
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 linux/kernel.h
#include linux/serial_reg.h
#include linux/slab.h
#include linux/module.h
#include linux/pci.h
+#include linux/console.h
#include linux/serial_core.h
#include linux/tty.h
#include linux/tty_flip.h
#include linux/interrupt.h
#include linux/io.h
#include linux/dmi.h
-#include linux/console.h
#include linux/nmi.h
#include linux/delay.h
@@ -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
