Skip to contentSkip to conversation

xilinx-ml507: add screen option

PATCH In review Adrian Alonso 2 participants 12 messages May 13, 2010 – May 24, 2010 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 xilinx-ml507: add screen option

---
 conf/machine/xilinx-ml507.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
conf/machine/xilinx-ml507.conf +2 -2
index 693f904..8c888b2 100644
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507"
 
 KERNEL_IMAGETYPE = "uImage"
 
-MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet"
+MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet screen"
 MACHINE_EXTRA_RECOMMENDS = "kernel-modules"
 
 UBOOT_ARCH = "ppc"
@@ -30,7 +30,7 @@ PREFERRED_VERSION_u-boot_xilinx-ml507 = "git"
 # XILINX_BOARD = "ml507"
 
 # Don't use tty1
-USE_VT = "0"
+# USE_VT = "0"
 SERIAL_CONSOLE = "9600 ttyS0"
 
 # Device nodes add xsa for (system ace)
Signature · 1 line
1.6.6.1
#1 lore raw

PATCH v2 2/5 defconfig: enable video framebuffer

---
 recipes/linux/linux-xilinx-ml507/defconfig |   95 +++++++++++++++++++++------
 1 files changed, 74 insertions(+), 21 deletions(-)
recipes/linux/linux-xilinx-ml507/defconfig +74 -21
index 693e141..087a530 100644
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Fri Feb 26 23:31:02 2010
+# Linux kernel version: 2.6.33
+# Thu Apr 22 23:23:13 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_IRQ_PER_CPU=y
+CONFIG_NR_IRQS=512
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DTC=y
 CONFIG_DEFAULT_UIMAGE=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_PPC_DCR_NATIVE=y
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
@@ -89,6 +91,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -98,8 +101,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -112,6 +114,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -172,14 +175,14 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_DEFAULT_AS is not set
@@ -187,6 +190,35 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 # CONFIG_PPC4xx_PCI_EXPRESS is not set
 
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_MAX_ACTIVE_REGIONS=32
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,8 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_HAVE_MLOCK=y
+# CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_STDBINUTILS=y
@@ -285,7 +318,7 @@ CONFIG_PPC_4K_PAGES=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" debug "
 CONFIG_EXTRA_TARGETS="simpleImage.virtex440-ml507 simpleImage.initrd.virtex440-ml507"
 CONFIG_SECCOMP=y
 # CONFIG_COMPRESSED_DEVICE_TREE is not set
@@ -383,6 +416,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -493,8 +527,8 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY=y
 # CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
 
@@ -512,8 +546,9 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -619,6 +654,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
@@ -667,7 +706,7 @@ CONFIG_HAVE_IDE=y
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
@@ -742,8 +781,10 @@ CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -756,6 +797,7 @@ CONFIG_WLAN=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -765,6 +807,7 @@ CONFIG_WLAN=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
 
 #
 # Userland interfaces
@@ -774,7 +817,7 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -818,6 +861,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_XILINXPS2 is not set
 CONFIG_SERIO_XILINX_XPS_PS2=y
 # CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -852,6 +896,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
@@ -892,6 +937,7 @@ CONFIG_GPIO_XILINX=y
 #
 # PCI GPIO expanders:
 #
+# CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 
@@ -1014,8 +1060,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
@@ -1077,6 +1123,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1108,7 +1155,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
@@ -1214,9 +1261,11 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
@@ -1321,7 +1370,11 @@ CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
Signature · 1 line
1.6.6.1
#2 lore raw

PATCH v2 3/5 linux-xilinx-ml507: update kernel version

* Update kernel version 2.6.33
* Include xilinx framebuffer patch

---
 recipes/linux/linux-xilinx-ml507_git.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
recipes/linux/linux-xilinx-ml507_git.bb +4 -3
index ec9de1c..fd3e33e 100644
@@ -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
Signature · 1 line
1.6.6.1
#3 lore raw

PATCH v2 4/5 xilinxfb: new patch

* Update hardware TFT video compatibility modules

---
 recipes/linux/linux-xilinx-ml507/xilinxfb.patch |   26 +++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 recipes/linux/linux-xilinx-ml507/xilinxfb.patch
recipes/linux/linux-xilinx-ml507/xilinxfb.patch new file +26 -0
new file mode 100644
index 0000000..ec33361
@@ -0,0 +1,26 @@
+From 54dc9b9e9cced3204b9d9a8a27319d9de662af3b Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <[email protected]>
+Date: Wed, 31 Mar 2010 22:14:55 -0600
+Subject: [PATCH] xilinxfb.c: add tft compatibility versions
+
+Signed-off-by: Adrian Alonso <[email protected]>
+---
+ 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
+
Signature · 1 line
1.6.6.1
#4 lore raw

PATCH v2 5/5 xserver-xorg-conf: add xilinx-ml507 config

* xorg config file for xilinx-ml507 target platform

---
 .../xserver-xorg-conf/xilinx-ml507/xorg.conf       |   39 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg-conf_0.1.bb      |    2 +-
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 recipes/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
recipes/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf new file +39 -0
new file mode 100644
index 0000000..aca5eed
@@ -0,0 +1,39 @@
+Section "Monitor"
+	Identifier "LCD Panel"
+EndSection
+
+Section "Device"
+    Identifier  "Xilinx frame buffer"
+    Driver      "fbdev"
+EndSection
+
+Section "Screen"
+    Identifier  "Default Screen"
+    Device      "Xilinx frame buffer"
+    Monitor     "LCD Panel"
+	SubSection "Display"
+		Depth   24
+        Modes   "640x480"
+	EndSubSection
+EndSection                             
+
+Section "InputDevice"
+    Identifier  "Keyboard"
+    Driver      "kbd"
+#    Option      "XkbLayout" "es"
+#    Option      "XkbModel"  "pc105"
+EndSection
+
+Section "InputDevice"
+    Identifier  "Mouse"
+    Driver      "mouse"
+    Option      "protocol" "auto"
+    Option      "device" "/dev/input/mice"
+EndSection
+
+Section "ServerLayout"
+    Identifier  "Default Layout"
+    Screen      "Default Screen"
+    InputDevice "Keyboard"
+    InputDevice "Mouse"
+EndSection
recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +1 -1
index 283bc58..c56aafc 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "file://xorg.conf"
 
Signature · 1 line
1.6.6.1
#5 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

In reply to Adrian Alonso

Hello.

Quoted 2 lines · Adrian Alonso

* 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

#6 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

Thanks,

I will rework patchs and resend them asap.

Regards

Quoted 21 lines · Stefan Schmidt

Hello.

Quoted 2 lines · Adrian Alonso

* 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Saludos
Adrian Alonso
http://aalonso.wordpress.com
#7 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

In reply to Stefan Schmidt

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.

Quoted 21 lines · Stefan Schmidt

Hello.

Quoted 2 lines · Adrian Alonso

* 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Saludos
Adrian Alonso
http://aalonso.wordpress.com

From dd4eee0fcddf5db52e49ee0df28f56500272ccaa Mon Sep 17 00:00:00 2001
From: Adrian Alonso <[email protected]>
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

---
 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
recipes/linux/linux-xilinx-ml507/xilinxfb.patch new file +26 -0
new file mode 100644
index 0000000..ec33361
@@ -0,0 +1,26 @@
+From 54dc9b9e9cced3204b9d9a8a27319d9de662af3b Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <[email protected]>
+Date: Wed, 31 Mar 2010 22:14:55 -0600
+Subject: [PATCH] xilinxfb.c: add tft compatibility versions
+
+Signed-off-by: Adrian Alonso <[email protected]>
+---
+ 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
+
recipes/linux/linux-xilinx-ml507_git.bb +4 -3
index ec9de1c..fd3e33e 100644
@@ -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
Signature · 1 line
1.6.6.1
#8 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

Hello.

Quoted 7 lines · Adrian Alonso

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.

No, thats good. What I normally do when I prepare a change that will contain more then 2 patches is that I'm creating a branch for this. If I found a bug later or people point them out to me in a review I will rework the patches in this branch and resend.

For the rework process you have a lot tools in git's toolbox, but I agree that they are are not the easiest ones. Still once I understood them I never want to miss them again. :)

Quoted 3 lines

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'm build testing this combination right now. One question that is still open is about the USE_VT in your first patch. Why did you comment it out? Something like this should be mentioned in the changelog.

regards
Stefan Schmidt

#9 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

Hi,

Quoted 29 lines · Stefan Schmidt

Hello.

Quoted 7 lines · Adrian Alonso

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.

No, thats good. What I normally do when I prepare a change that will contain
more then 2 patches is that I'm creating a branch for this. If I found a bug
later or people point them out to me in a review I will rework the patches in
this branch and resend.

For the rework process you have a lot tools in git's toolbox, but I agree that
they are are not the easiest ones. Still once I understood them I never want to
miss them again. :)

Quoted 3 lines

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.

Quoted 7 lines

I'm build testing this combination right now. One question that is still open is
about the USE_VT in your first patch. Why did you comment it out? Something like
this should be mentioned in the changelog.

Yep I forgot to comment why i disable this option, it disables virtual

terminal, i think in
kernel options (not sure); disabling USE_VT I can have xserver running otherwise fails
config files for machines that have by default graphical support don't include this option
and i saw that only machines that doesn't have graphical support use this option to
explicitly disable it.

Since we are in a dynamic architecture where display support can be included or not
in the hardware model, i think that leaving the option in the config file is a good idea
and just add some comments mentioning when this option is useful.

Thanks for your help.

regards

Quoted 7 lines

Stefan Schmidt

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Saludos
Adrian Alonso
http://aalonso.wordpress.com
#10 lore raw

Re: [PATCH 3/5 v2] linux-xilinx-ml507: update kernel version

Hello.

Quoted 20 lines · Adrian Alonso
Quoted 8 lines · Stefan Schmidt

I'm build testing this combination right now. One question that is still open is
about the USE_VT in your first patch. Why did you comment it out? Something like
this should be mentioned in the changelog.

Yep I forgot to comment why i disable this option, it disables virtual

terminal, i think in
kernel options (not sure); disabling USE_VT I can have xserver running otherwise fails
config files for machines that have by default graphical support don't include this option
and i saw that only machines that doesn't have graphical support use this option to
explicitly disable it.

Quoted 5 lines

Since we are in a dynamic architecture where display support can be included or not
in the hardware model, i think that leaving the option in the config file is a good idea
and just add some comments mentioning when this option is useful.

I added a note about this into the commit message. I also changed a bit in the other messages. Please keep in mind to make them in a proper way. When I do a review it is always the first part I read and try to understand, afterwards I'm checking if the message matches the change itself and then I'm going to review the change.

Every problem you can avoid before sending the patches off is time that is safed in review cycles and in the end until it is pushed into the repo.

I found no problems during some build tests and pushed them into the repo. Thanks.

regards
Stefan Schmidt

#11 lore raw
In reply to Adrian Alonso

Hello.

Quoted 19 lines · Adrian Alonso
---
 conf/machine/xilinx-ml507.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
conf/machine/xilinx-ml507.conf +1 -1
index 693f904..8c888b2 100644
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507"
 
 KERNEL_IMAGETYPE = "uImage"
 
-MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet"
+MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet screen"
 MACHINE_EXTRA_RECOMMENDS = "kernel-modules"
 
 UBOOT_ARCH = "ppc"

conf/machine/xilinx-ml507.conf PREFERRED_VERSION_u-boot_xilinx-ml507 = "git" · line 33

Quoted 5 lines
conf/machine/xilinx-ml507.conf +1 -1
@@ -30,7 +30,7 @@ PREFERRED_VERSION_u-boot_xilinx-ml507 = "git"
 # XILINX_BOARD = "ml507"
 
 # Don't use tty1
-USE_VT = "0"
+# USE_VT = "0"

This unrelated hunk not mentioned in the changelog. Is it there by mistake?

If there is a reason for it please state it in the changelog and resend.

regards
Stefan Schmidt