[linux-yocto] [PATCH 3/5] fri2: Remove graphics options from the core fri2 description

Darren Hart dvhart at linux.intel.com
Mon Oct 22 15:28:52 PDT 2012

In preparation for a tiny description, move the fri2 graphics
options out of the base fri2 description and into the types
that use it.

Do not include the drm-emgd config for preempt-rt as we do not
support the emgd driver for this kernel type.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
 meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    3 +++
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    4 ++++
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
index c474c71..2dd20a8 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc
@@ -7,7 +7,10 @@ include ktypes/preempt-rt
 branch fri2
 include fri2.scc
+# Extra fri2 configs above the minimal defined in fri2.scc
 include cfg/efi-ext.scc
+include cfg/vesafb.scc
 # default policy for preempt-rt kernels
 include cfg/usb-mass-storage.scc
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
index 8205135..fc47a2e 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
@@ -8,7 +8,11 @@ branch fri2
 git merge emgd-1.14
 include fri2.scc
+# Extra fri2 configs above the minimal defined in fri2.scc
 include cfg/efi-ext.scc
+include features/drm-emgd/drm-emgd.scc
+include cfg/vesafb.scc
 # default policy for standard kernels
 include cfg/usb-mass-storage.scc
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
index 200fdfb..fa718b1 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
@@ -2,10 +2,8 @@ kconf hardware fri2.cfg
 include cfg/x86.scc
 include features/eg20t/eg20t.scc
-include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc
-include cfg/vesafb.scc
 include features/power/intel.scc
 include cfg/efi.scc
 include features/usb/ehci-hcd.scc

More information about the linux-yocto mailing list