summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-02-03 11:35:38 -0800
committerDarren Hart <dvhart@linux.intel.com>2014-02-03 11:35:38 -0800
commitbecb74a76ee9784e025d4b2ee9e79987780c2a16 (patch)
tree0c6b118128ce8fdf6512c522785ec42d01f78a0d
parentc5ca9f67121bff0b7400a175f005212234906b37 (diff)
downloadmeta-intel-becb74a76ee9784e025d4b2ee9e79987780c2a16.tar.gz
emenlow: Move reboot quirk to MACHINE config from linux-yocto
Move the "reboot=pci" quirk from the linux-yocto BSP definition to the machine config APPEND line. This pushes config space stuff up into the meta-intel machine definition where it is more accessible and allows for consolidation in the linux-yocto level. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Nitin Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta-emenlow/conf/machine/emenlow-noemgd.conf1
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf
index 571e2f14..f7b11e6e 100644
--- a/meta-emenlow/conf/machine/emenlow-noemgd.conf
+++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf
@@ -13,3 +13,4 @@ XSERVER ?= "${XSERVER_X86_BASE} \
13 ${XSERVER_X86_EXT} \ 13 ${XSERVER_X86_EXT} \
14 ${XSERVER_X86_MODESETTING} \ 14 ${XSERVER_X86_MODESETTING} \
15 " 15 "
16APPEND += "reboot=pci"
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index ebbde95d..502d196a 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -29,4 +29,4 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
29PREFERRED_VERSION_emgd-driver-bin ?= "1.18" 29PREFERRED_VERSION_emgd-driver-bin ?= "1.18"
30PREFERRED_VERSION_libva ?= "1.0.16" 30PREFERRED_VERSION_libva ?= "1.0.16"
31 31
32APPEND += "video=vesafb vga=0x318 vmalloc=256MB" 32APPEND += "video=vesafb vga=0x318 vmalloc=256MB reboot=pci"