From 087e5845266868d9b4240c5c141f4b0cf97eaa21 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 28 Nov 2012 12:49:09 -0500
Subject: [PATCH] beagleboard: move preempt-disable to standard kernel only

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 bsp/beagleboard/beagleboard-standard.scc | 4 ++++
 bsp/beagleboard/beagleboard.scc          | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bsp/beagleboard/beagleboard-standard.scc b/bsp/beagleboard/beagleboard-standard.scc
index 8e11bc5e0..311b740db 100644
--- a/bsp/beagleboard/beagleboard-standard.scc
+++ b/bsp/beagleboard/beagleboard-standard.scc
@@ -7,6 +7,10 @@ branch beagleboard
 
 include beagleboard.scc
 
+# preemption is causing boot problems with some SDs, so disabling
+# it for the standard kernel
+include no-preempt.scc
+
 # default policy for standard kernels
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
diff --git a/bsp/beagleboard/beagleboard.scc b/bsp/beagleboard/beagleboard.scc
index c0dd025ee..6a408beb5 100644
--- a/bsp/beagleboard/beagleboard.scc
+++ b/bsp/beagleboard/beagleboard.scc
@@ -4,4 +4,3 @@ kconf non-hardware beagleboard-non_hardware.cfg
 include features/usb-net/usb-net.scc
 include wifi.scc
 include wl1271.scc
-include no-preempt.scc
-- 
GitLab