From: Zhai Edwin <edwin.zhai@intel.com>
Date: Wed, 15 Sep 2010 03:55:45 +0000 (+0800)
Subject: formfactor: Add machconfig in qemux86-64 to avoid HAVE_KEYBOARD unset.
X-Git-Tag: yocto-4.0~44196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e9caafd0b94016568dfccf969a0e326f3645fa6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

formfactor: Add machconfig in qemux86-64 to avoid HAVE_KEYBOARD unset.
This prevent matchbox-kerboard starting as daemon automatically.

Also fix minor issue of netbase on qemux86-64, and add the machine in
local.conf.sample

[BUGID #308] fixed by this.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index f9a1431efeb..052c1a94067 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -20,6 +20,7 @@ MACHINE ?= "qemux86"
 
 # Other supported machines
 #MACHINE ?= "qemuarm"
+#MACHINE ?= "qemux86-64"
 #MACHINE ?= "netbook"
 #MACHINE ?= "c7x0"
 #MACHINE ?= "akita"
diff --git a/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig b/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
new file mode 100755
index 00000000000..56a2ae2e3c3
--- /dev/null
+++ b/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
@@ -0,0 +1,10 @@
+HAVE_TOUCHSCREEN=1
+HAVE_KEYBOARD=1
+ 
+DISPLAY_CAN_ROTATE=0
+DISPLAY_ORIENTATION=0
+#DISPLAY_WIDTH_PIXELS=640
+#DISPLAY_HEIGHT_PIXELS=480
+#DISPLAY_BPP=16
+DISPLAY_DPI=150
+DISPLAY_SUBPIXEL_ORDER=vrgb
diff --git a/meta/recipes-core/netbase/netbase_4.41.bb b/meta/recipes-core/netbase/netbase_4.41.bb
index 90725b241e3..8c31df9ac85 100644
--- a/meta/recipes-core/netbase/netbase_4.41.bb
+++ b/meta/recipes-core/netbase/netbase_4.41.bb
@@ -38,7 +38,7 @@ do_install () {
 
 	# Disable network manager on machines that commonly do NFS booting
 	case "${MACHINE}" in
-		"omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" )
+		"omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" | "qemux86-64" )
 			touch ${D}${sysconfdir}/network/nm-disabled-eth0
 			;;
 		*)
@@ -53,3 +53,4 @@ PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
 PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}"
 PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}"
 PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemux86-64 = "${MACHINE_ARCH}"