Hi Stefan,
I have been looking on how to reorder the patch,
but I'm still a git newbie :( and I don't quite well
understand how to regenerate my patch sets with
modifying the git log history, what I'm been doing
is to create a new branch fix my patchs and resend
them, thats clearly wrong.
Can you remove the patchs send on 2010-04-27 and
from the second patch set remove patch 3 and 4;
and use the path attached to make git bisec happy.
I will do my homework to avoid further integrations.
Thanks.
On Fri, May 14, 2010 at 7:21 AM, Stefan Schmidt
<ste...@datenfreihafen.org>wrote:
> Hello.
>
> On Thu, 2010-05-13 at 08:46, Adrian Alonso wrote:
> > * Update kernel version 2.6.33
> > * Include xilinx framebuffer patch
>
> You need to reorder your patchset to have the fb patch prior to this
> change.
> Without this git bisect will break.
>
> Looking over the patch I think it would be fine to have it merged into this
> patch as well. Small enough.
>
> regards
> Stefan Schmidt
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Saludos
Adrian Alonso
http://aalonso.wordpress.com
From dd4eee0fcddf5db52e49ee0df28f56500272ccaa Mon Sep 17 00:00:00 2001
From: Adrian Alonso <aalons...@gmail.com>
Date: Wed, 19 May 2010 09:23:58 -0500
Subject: [PATCH] linux-xilinx-ml507: update kernel version
* kernel version 2.6.33
* frame buffer fix patch add support for new xps_tft
display modules
Signed-off-by: Adrian Alonso <aalons...@gmail.com>
---
recipes/linux/linux-xilinx-ml507/xilinxfb.patch | 26 +++++++++++++++++++++++
recipes/linux/linux-xilinx-ml507_git.bb | 7 +++--
2 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 recipes/linux/linux-xilinx-ml507/xilinxfb.patch
diff --git a/recipes/linux/linux-xilinx-ml507/xilinxfb.patch b/recipes/linux/linux-xilinx-ml507/xilinxfb.patch
new file mode 100644
index 0000000..ec33361
--- /dev/null
+++ b/recipes/linux/linux-xilinx-ml507/xilinxfb.patch
@@ -0,0 +1,26 @@
+From 54dc9b9e9cced3204b9d9a8a27319d9de662af3b Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalons...@gmail.com>
+Date: Wed, 31 Mar 2010 22:14:55 -0600
+Subject: [PATCH] xilinxfb.c: add tft compatibility versions
+
+Signed-off-by: Adrian Alonso <aalons...@gmail.com>
+---
+ drivers/video/xilinxfb.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
+index ed7c8d0..829efaa 100644
+--- a/drivers/video/xilinxfb.c
++++ b/drivers/video/xilinxfb.c
+@@ -484,6 +484,8 @@ static int __devexit xilinxfb_of_remove(struct of_device *op)
+ /* Match table for of_platform binding */
+ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
+ { .compatible = "xlnx,xps-tft-1.00.a", },
++ { .compatible = "xlnx,xps-tft-2.00.a", },
++ { .compatible = "xlnx,xps-tft-2.01.a", },
+ { .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },
+ { .compatible = "xlnx,plb-dvi-cntlr-ref-1.00.c", },
+ {},
+--
+1.6.6.1
+
diff --git a/recipes/linux/linux-xilinx-ml507_git.bb b/recipes/linux/linux-xilinx-ml507_git.bb
index ec9de1c..fd3e33e 100644
--- a/recipes/linux/linux-xilinx-ml507_git.bb
+++ b/recipes/linux/linux-xilinx-ml507_git.bb
@@ -1,17 +1,18 @@
require linux.inc
DESCRIPTION = "Linux kernel for Xilinx ml507 platform"
-KERNEL_RELEASE = "2.6.32+git"
+KERNEL_RELEASE = "2.6.33+git"
COMPATIBLE_MACHINE = "xilinx-ml507"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_xilinx-ml507 = "1"
PV = "${KERNEL_RELEASE}"
-PR = "r0"
+PR = "r1"
-SRCREV = "dc53725d22405e384b984d222542f526eaa9b829"
+SRCREV = "17431547113100a3ae0a622b9f76ad17fb76eb56"
SRC_URI = "git://git.xilinx.com/linux-2.6-xlnx.git;protocol=git \
+ file://xilinxfb.patch;patch=1 \
file://defconfig"
inherit kernel xilinx-bsp
--
1.6.6.1
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
