[PATCH] meta-eldk/conf: Resync bblayers.conf and local.conf

[Detlev Zundel]

The yocto 1.4 provided samples are synced again with the ELDK
documentation to easily start a build with minimal conf file editing
like this:

TEMPLATECONF=meta-eldk/conf . oe-init-build-env <build-dir>

Signed-off-by: Detlev Zundel <dzu at denx.de>
---
 meta-eldk/conf/bblayers.conf.sample | 4 ++++
 meta-eldk/conf/local.conf.sample    | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta-eldk/conf/bblayers.conf.sample b/meta-eldk/conf/bblayers.conf.sample
index 56cd63a..04955f3 100644
--- a/meta-eldk/conf/bblayers.conf.sample
+++ b/meta-eldk/conf/bblayers.conf.sample
@@ -11,3 +11,7 @@ BBLAYERS ?= " \
   ##COREBASE##/meta-yocto-bsp \
   ##COREBASE##/meta-eldk \
   "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##COREBASE##/meta \
+  ##COREBASE##/meta-yocto \
+  "
diff --git a/meta-eldk/conf/local.conf.sample b/meta-eldk/conf/local.conf.sample
index 0483c01..84f5a8b 100644
--- a/meta-eldk/conf/local.conf.sample
+++ b/meta-eldk/conf/local.conf.sample
@@ -17,17 +17,15 @@
 # These two options control how much parallelism BitBake should use. The first 
 # option determines how many tasks bitbake should run in parallel:
 #
-#BB_NUMBER_THREADS = "4"
+BB_NUMBER_THREADS = "4"
 # 
 # The second option controls how many processes make should run in parallel when
 # running compile tasks:
 #
-#PARALLEL_MAKE = "-j 4"
+PARALLEL_MAKE = "-j 4"
 #
 # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
 # be appropriate for example.
-BB_NUMBER_THREADS = "4"
-PARALLEL_MAKE = "-j 4"
 
 #
 # Machine Selection
-- 
1.7.11.7


--=-=-=--