From 86525216c6b8bdb850bf01958fe4defae3b42f4a Mon Sep 17 00:00:00 2001 From: "Chang, Rebecca Swee Fun" Date: Tue, 22 Oct 2013 18:43:23 +0800 Subject: meta-crystalforest: update recipes-kernel to support linux version 3.8.13 and remove recipes-graphics This patch is to upgrade meta-crystalforest to support linux kernel v3.8.13. It also contains patch to remove xorg.conf from Crystalforest BSP for both Gladden and Server platforms. BSP can depends on X to auto-configure. Signed-off-by: Chang, Rebecca Swee Fun Signed-off-by: Tom Zanussi --- .../crystalforest-gladden/xorg.conf | 26 ---------------------- .../crystalforest-server/xorg.conf | 26 ---------------------- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 - .../recipes-kernel/linux/linux-yocto_3.8.bbappend | 10 ++++----- 4 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf deleted file mode 100644 index 28ad0bf7..00000000 --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf +++ /dev/null @@ -1,26 +0,0 @@ -Section "Device" - Identifier "Matrox MGA" - Driver "mga" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Matrox MGA" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" -EndSection - -Section "ServerFlags" - Option "DontZap" "0" - Option "AutoAddDevices" "False" -EndSection diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf deleted file mode 100644 index 28ad0bf7..00000000 --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf +++ /dev/null @@ -1,26 +0,0 @@ -Section "Device" - Identifier "Matrox MGA" - Driver "mga" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Matrox MGA" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" -EndSection - -Section "ServerFlags" - Option "DontZap" "0" - Option "AutoAddDevices" "False" -EndSection diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index 72d991c7..00000000 --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend index c20b6c13..47a24372 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -4,16 +4,16 @@ COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" KMACHINE_crystalforest-gladden = "crystalforest" KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" -SRCREV_machine_pn-linux-yocto_crystalforest-gladden ?= "47aed0c17c1c55988198ad39f86ae88894c8e0a4" -SRCREV_meta_pn-linux-yocto_crystalforest-gladden ?= "2a6d36e75ca0a121570a389d7bab76ec240cbfda" +SRCREV_machine_pn-linux-yocto_crystalforest-gladden ?= "dbf932a9b316d5b29b3e220e5a30e7a165ad2992" +SRCREV_meta_pn-linux-yocto_crystalforest-gladden ?= "cb96851e7e559f9247d616d08406db6135c357cb" COMPATIBLE_MACHINE_crystalforest-server = "crystalforest-server" KMACHINE_crystalforest-server = "crystalforest" KBRANCH_crystalforest-server = "standard/common-pc-64/crystalforest" -SRCREV_machine_pn-linux-yocto_crystalforest-server ?= "47aed0c17c1c55988198ad39f86ae88894c8e0a4" -SRCREV_meta_pn-linux-yocto_crystalforest-server ?= "2a6d36e75ca0a121570a389d7bab76ec240cbfda" +SRCREV_machine_pn-linux-yocto_crystalforest-server ?= "dbf932a9b316d5b29b3e220e5a30e7a165ad2992" +SRCREV_meta_pn-linux-yocto_crystalforest-server ?= "cb96851e7e559f9247d616d08406db6135c357cb" -LINUX_VERSION = "3.8.4" +LINUX_VERSION = "3.8.13" module_autoload_uio = "uio" -- cgit v1.2.3-54-g00ecf