linux-tx09: Update kernel and configuration, fix USB host support

[meta-tx09.git] / setup-environment

diff --git a/setup-environment b/setup-environment
index c8ab38901c1be59eab6c7ee9210378b938986787..4efec1c64a2373094eac37f2ee902d6fa87e13a6 100755 (executable)
--- a/setup-environment
+++ b/setup-environment
@@ -27,14 +27,16 @@ PROGNAME="setup-environment"
 usage()
 {
     echo -e "
+Usage: . $PROGNAME <build-dir>
 Usage: MACHINE=<machine> DISTRO=<distro> source $PROGNAME <build-dir>
 Usage:                                   source $PROGNAME <build-dir>
     <machine>    machine name
-    <distro>     distro name
+    <distro>     distribution name
     <build-dir>  build directory
 
 The first usage is for creating a new build directory. In this case, the
-script creates the build directory <build-dir>, configures it for the
+script creates the build directory <build-dir> and confgures it according
+to the supplied sdkdefaults.conf. Optionally it configures it for the
 specified <machine> and <distro>, and prepares the calling shell for running
 bitbake on the build directory.
 
@@ -55,11 +57,13 @@ Available Poky's distros: `echo; ls yocto/poky/meta-poky/conf/distro/*.conf \
 
 Examples:
 
+- To use an existing Yocto build directory or create a new buil dir using 
+  the supplied defaults.
+  $ . $PROGNAME build
+  
 - To create a new Yocto build directory:
   $ MACHINE=tx6q-xxxx DISTRO=poky . $PROGNAME build
 
-- To use an existing Yocto build directory:
-  $ . $PROGNAME build
 "
     fi
 }
@@ -157,7 +161,7 @@ if [ "$build_dir_setup_enabled" = "true" ]; then
 
     # Generate the local.conf based on the Yocto defaults
     TEMPLATES=$CWD/yocto/meta-kc-bsp/conf
-    grep -v '^#\|^$' conf/local.conf.sample > conf/local.conf
+    cat conf/local.conf.sample > conf/local.conf
     cat >> conf/local.conf <<EOF
 
 DL_DIR ?= "\${BSPDIR}/downloads/"