Fix for clean px4fmu build

3 files changed, 4 insertions, 63 deletions

diff --git a/nuttx/configs/px4fmu-v2_upstream/include/nsh_romfsimg.h b/nuttx/configs/px4fmu-v2_upstream/include/nsh_romfsimg.h
deleted file mode 100644
index d2f0d7bee..000000000
--- a/nuttx/configs/px4fmu-v2_upstream/include/nsh_romfsimg.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
- * configs/px4fmu-v2_upstream/include/romfsimg.h
- *
- *   Copyright (C) 2013 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __CONFIGS_PX4FMU_V2_UPSTREAM_INCLUDE_ROMFSIMG_H
-#define __CONFIGS_PX4FMU_V2_UPSTREAM_INCLUDE_ROMFSIMG_H
-
-/****************************************************************************
- * Public Variables
- ****************************************************************************/
-
-extern unsigned char romfs_img[];
-extern unsigned int romfs_img_len;
-
-#endif /* __CONFIGS_PX4FMU_V2_UPSTREAM_INCLUDE_ROMFSIMG_H */
diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig b/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig
index 1498a957d..909ab48df 100644
--- a/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig
@@ -1017,17 +1017,7 @@ CONFIG_NSH_MAXARGUMENTS=12
 CONFIG_NSH_NESTDEPTH=8
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_ROMFSETC=y
-# CONFIG_NSH_ROMFSRC is not set
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=128
-CONFIG_NSH_ARCHROMFS=y
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
+# CONFIG_NSH_ROMFSETC is not set
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_USBCONSOLE is not set
 
diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh b/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh
index cb4006837..01f62bbe1 100755
--- a/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh
+++ b/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/px4fmu-v2_upstream/nsh/setenv.sh
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -47,15 +47,11 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
-# toolchain under windows.  You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
 # This the Cygwin path to the location where I installed the CodeSourcery
 # toolchain under windows.  You will also have to edit this if you install
 # the CodeSourcery toolchain in any other location
-export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin
 
 # This the Cygwin path to the location where I build the buildroot
 # toolchain.