[oe-commits] org.oe.dev merge of '8609dfe0ecad86d5c032ff47c7257165507c47fe'

[oe commit]

merge of '8609dfe0ecad86d5c032ff47c7257165507c47fe'
     and 'fb60e809e63aacb52c9c7bf0dd942e3b8c998d16'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 228dd3777f4e26267c87ee4671f6679f5fecf430
ViewMTN: http://monotone.openembedded.org/revision/info/228dd3777f4e26267c87ee4671f6679f5fecf430
Files:
1
packages/linux/linux-omap2-git/omap3evm/flash.patch
packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
conf/machine/efika.conf
packages/images/beagleboard-demo-image.bb
packages/linux/linux-omap2_git.bb
packages/xorg-driver/xf86-video-tdfx_1.4.0.bb
packages/xorg-driver/xf86-video-tseng_1.2.0.bb
packages/xorg-driver/xf86-video-v4l_0.2.0.bb
packages/xorg-driver/xf86-video-vmware_10.16.1.bb
packages/xorg-driver/xf86-video-voodoo_1.2.0.bb
Diffs:

#
# mt diff -r8609dfe0ecad86d5c032ff47c7257165507c47fe -r228dd3777f4e26267c87ee4671f6679f5fecf430
#
#
#
# delete "packages/linux/linux-omap2-git/omap3evm/flash.patch"
# 
# add_file "packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff"
#  content [ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c]
# 
# patch "conf/machine/efika.conf"
#  from [08a6498b09a4e63a1c570a6944a3d2f243c59160]
#    to [c72523935798601ef0078e59ad1152c319a67fe4]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [f70ee41394921debd219b58d972968d5d915bb73]
#    to [ffd33ba809f3a93260de5ffad170f0c52da8a9db]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [728a83a1d213657ee125565b0bd34a9006bcca11]
#    to [947402088688f4d67b5eedf1d81246f553d9bd61]
#
============================================================
--- packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff	ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
+++ packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff	ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2008-04-24 14:36:20.509598016 +0200
++++ git/arch/arm/Makefile	2008-04-24 14:36:31.949546584 +0200
+@@ -47,7 +47,7 @@
+ # Note that GCC does not numerically define an architecture version
+ # macro, but instead defines a whole series of macros which makes
+ # testing for a specific architecture or later rather impossible.
+-arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
++arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
+ arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
+ # Only override the compiler option if ARMv6. The ARMv6K extensions are
+ # always available in ARMv7
============================================================
--- conf/machine/efika.conf	08a6498b09a4e63a1c570a6944a3d2f243c59160
+++ conf/machine/efika.conf	c72523935798601ef0078e59ad1152c319a67fe4
@@ -5,7 +5,7 @@ PACKAGE_EXTRA_ARCHS = "ppc603e"
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc603e"
 
-#PREFERRED_PROVIDER_virtual/kernel ?= "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
 
============================================================
--- packages/images/beagleboard-demo-image.bb	f70ee41394921debd219b58d972968d5d915bb73
+++ packages/images/beagleboard-demo-image.bb	ffd33ba809f3a93260de5ffad170f0c52da8a9db
@@ -20,7 +20,7 @@ IMAGE_INSTALL = "\
     e-wm exhibit \
     xterm xmms epiphany-firefox-replacement \
     hicolor-icon-theme gnome-icon-theme \
-    jaaa octave nmap iperf gnuplot \
+    jaaa nmap iperf gnuplot \
     abiword gnumeric gimp minimo \
     powertop \
 "
============================================================
--- packages/linux/linux-omap2_git.bb	728a83a1d213657ee125565b0bd34a9006bcca11
+++ packages/linux/linux-omap2_git.bb	947402088688f4d67b5eedf1d81246f553d9bd61
@@ -13,7 +13,6 @@ SRC_URI_append_beagleboard = " file://no
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-	   file://flash.patch;patch=1 \
 	   file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
 	   file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
 	   file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \


#
# mt diff -rfb60e809e63aacb52c9c7bf0dd942e3b8c998d16 -r228dd3777f4e26267c87ee4671f6679f5fecf430
#
#
#
# add_file "packages/xorg-driver/xf86-video-tdfx_1.4.0.bb"
#  content [fa6975b2171d35007943581ed15995d9f046bb6c]
# 
# add_file "packages/xorg-driver/xf86-video-tseng_1.2.0.bb"
#  content [7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19]
# 
# add_file "packages/xorg-driver/xf86-video-v4l_0.2.0.bb"
#  content [eb79324143f0f4370dcad655414714d4a7f1412e]
# 
# add_file "packages/xorg-driver/xf86-video-vmware_10.16.1.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
# add_file "packages/xorg-driver/xf86-video-voodoo_1.2.0.bb"
#  content [ff9d89872bccf259ab97273d9fec96ca37405df2]
#
============================================================
--- packages/xorg-driver/xf86-video-tdfx_1.4.0.bb	fa6975b2171d35007943581ed15995d9f046bb6c
+++ packages/xorg-driver/xf86-video-tdfx_1.4.0.bb	fa6975b2171d35007943581ed15995d9f046bb6c
@@ -0,0 +1,12 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
+
+EXTRA_OECONF += " \
+  ac_cv_file__usr_include_xorg_dri_h=yes \
+  ac_cv_file__usr_include_xorg_sarea_h=yes \
+  ac_cv_file__usr_include_xorg_dristruct_h=yes \
+"
============================================================
--- packages/xorg-driver/xf86-video-tseng_1.2.0.bb	7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
+++ packages/xorg-driver/xf86-video-tseng_1.2.0.bb	7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
============================================================
--- packages/xorg-driver/xf86-video-v4l_0.2.0.bb	eb79324143f0f4370dcad655414714d4a7f1412e
+++ packages/xorg-driver/xf86-video-v4l_0.2.0.bb	eb79324143f0f4370dcad655414714d4a7f1412e
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "Video 4 Linux adaptor driver for X11"
============================================================
--- packages/xorg-driver/xf86-video-vmware_10.16.1.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-vmware_10.16.1.bb	a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-voodoo_1.2.0.bb	ff9d89872bccf259ab97273d9fec96ca37405df2
+++ packages/xorg-driver/xf86-video-voodoo_1.2.0.bb	ff9d89872bccf259ab97273d9fec96ca37405df2
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+
+DEPENDS += " xf86dgaproto"