From e1ae0eae360598e3e9b4b27e044f9273eea6cc34 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Fri, 7 Oct 2011 12:41:46 +0000
Subject: [PATCH] File default path to nuttx in buildroot

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4029 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 misc/buildroot/ChangeLog                         | 2 ++
 misc/buildroot/Config.in                         | 2 +-
 misc/buildroot/configs/arm-defconfig             | 2 +-
 misc/buildroot/configs/arm7tdmi-defconfig-4.2.4  | 2 +-
 misc/buildroot/configs/arm7tdmi-defconfig-4.3.3  | 2 +-
 misc/buildroot/configs/arm920t-defconfig-4.2.4   | 2 +-
 misc/buildroot/configs/arm926t-defconfig-4.2.4   | 2 +-
 misc/buildroot/configs/arm926t-defconfig-4.3.3   | 2 +-
 misc/buildroot/configs/arm926t-defconfig-nxflat  | 2 +-
 misc/buildroot/configs/avr-defconfig-4.3.3       | 2 +-
 misc/buildroot/configs/bfin-defconfig-4.2.4      | 2 +-
 misc/buildroot/configs/cortexm3-defconfig-4.3.3  | 2 +-
 misc/buildroot/configs/cortexm3-defconfig-nxflat | 2 +-
 misc/buildroot/configs/h8300_defconfig           | 2 +-
 misc/buildroot/configs/m32c-defconfig-4.2.4      | 2 +-
 misc/buildroot/configs/m32c-defconfig-4.3.3      | 2 +-
 misc/buildroot/configs/m68hc11-config            | 2 +-
 misc/buildroot/configs/m68hc12-config-3.4.6      | 2 +-
 misc/buildroot/configs/m68hc12-config-4.3.3      | 2 +-
 misc/buildroot/configs/m68k-defconfig            | 2 +-
 misc/buildroot/configs/sh-defconfig              | 2 +-
 21 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 7b5908b77..59de91a73 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -106,4 +106,6 @@ buildroot-1.11 2011-xx-xx <spudmonkey@racsa.co.cr>
 	* configs/avr-defconfig-4.3.3 - Added --enable-long-long as a GCC
 	  option.
 	* configs/avr-defconfig-4.5.2 - New configuration.
+	* Config.in and almost all configurations in configs/ - Changed the
+	  default nuttx path to $(TOPDIR)/../../nuttx
 
diff --git a/misc/buildroot/Config.in b/misc/buildroot/Config.in
index f0acab7d6..d5c5fbfe7 100644
--- a/misc/buildroot/Config.in
+++ b/misc/buildroot/Config.in
@@ -311,7 +311,7 @@ config BR2_STAGING_DIR
 
 config BR2_NUTTX_DIR
 	string "Path to the NuttX root directory"
-	default "../nuttx"
+	default "$(TOPDIR)/../../nuttx"
 	help
 	  This is the location where the NuttX source tree is located.
 
diff --git a/misc/buildroot/configs/arm-defconfig b/misc/buildroot/configs/arm-defconfig
index b8fa87cf8..bcdab8c89 100644
--- a/misc/buildroot/configs/arm-defconfig
+++ b/misc/buildroot/configs/arm-defconfig
@@ -54,7 +54,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
index 6600cbc8e..00f05bc9c 100644
--- a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
index 101397501..9207ad3e2 100644
--- a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/arm920t-defconfig-4.2.4 b/misc/buildroot/configs/arm920t-defconfig-4.2.4
index f37cefb23..4abf36813 100644
--- a/misc/buildroot/configs/arm920t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm920t-defconfig-4.2.4
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.2.4 b/misc/buildroot/configs/arm926t-defconfig-4.2.4
index ff1888580..1c5ae784d 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm926t-defconfig-4.2.4
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.3.3 b/misc/buildroot/configs/arm926t-defconfig-4.3.3
index d81ef6659..3d3d7d9f7 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm926t-defconfig-4.3.3
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="arm-elf"
diff --git a/misc/buildroot/configs/arm926t-defconfig-nxflat b/misc/buildroot/configs/arm926t-defconfig-nxflat
index 349416310..f0ddd17bc 100644
--- a/misc/buildroot/configs/arm926t-defconfig-nxflat
+++ b/misc/buildroot/configs/arm926t-defconfig-nxflat
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="arm-elf"
diff --git a/misc/buildroot/configs/avr-defconfig-4.3.3 b/misc/buildroot/configs/avr-defconfig-4.3.3
index 33d0165c4..9ac1f1ffa 100644
--- a/misc/buildroot/configs/avr-defconfig-4.3.3
+++ b/misc/buildroot/configs/avr-defconfig-4.3.3
@@ -37,7 +37,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/bfin-defconfig-4.2.4 b/misc/buildroot/configs/bfin-defconfig-4.2.4
index 813878e5c..a88b9f269 100644
--- a/misc/buildroot/configs/bfin-defconfig-4.2.4
+++ b/misc/buildroot/configs/bfin-defconfig-4.2.4
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/cortexm3-defconfig-4.3.3 b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
index e0ee61a7c..36a441c69 100644
--- a/misc/buildroot/configs/cortexm3-defconfig-4.3.3
+++ b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/cortexm3-defconfig-nxflat b/misc/buildroot/configs/cortexm3-defconfig-nxflat
index d4a8f16d7..ac247703a 100644
--- a/misc/buildroot/configs/cortexm3-defconfig-nxflat
+++ b/misc/buildroot/configs/cortexm3-defconfig-nxflat
@@ -56,7 +56,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/h8300_defconfig b/misc/buildroot/configs/h8300_defconfig
index 629743196..127b04de3 100644
--- a/misc/buildroot/configs/h8300_defconfig
+++ b/misc/buildroot/configs/h8300_defconfig
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m32c-defconfig-4.2.4 b/misc/buildroot/configs/m32c-defconfig-4.2.4
index 0630f7486..cf6b51bde 100644
--- a/misc/buildroot/configs/m32c-defconfig-4.2.4
+++ b/misc/buildroot/configs/m32c-defconfig-4.2.4
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m32c-defconfig-4.3.3 b/misc/buildroot/configs/m32c-defconfig-4.3.3
index ff0436e9a..ef7fa4d00 100644
--- a/misc/buildroot/configs/m32c-defconfig-4.3.3
+++ b/misc/buildroot/configs/m32c-defconfig-4.3.3
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m68hc11-config b/misc/buildroot/configs/m68hc11-config
index de6eeb65b..9496beb66 100644
--- a/misc/buildroot/configs/m68hc11-config
+++ b/misc/buildroot/configs/m68hc11-config
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m68hc12-config-3.4.6 b/misc/buildroot/configs/m68hc12-config-3.4.6
index 7ea19b1c5..3277e0989 100644
--- a/misc/buildroot/configs/m68hc12-config-3.4.6
+++ b/misc/buildroot/configs/m68hc12-config-3.4.6
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m68hc12-config-4.3.3 b/misc/buildroot/configs/m68hc12-config-4.3.3
index 07b9d136d..e889e273d 100644
--- a/misc/buildroot/configs/m68hc12-config-4.3.3
+++ b/misc/buildroot/configs/m68hc12-config-4.3.3
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/m68k-defconfig b/misc/buildroot/configs/m68k-defconfig
index f5518df09..2de720755 100644
--- a/misc/buildroot/configs/m68k-defconfig
+++ b/misc/buildroot/configs/m68k-defconfig
@@ -36,7 +36,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
diff --git a/misc/buildroot/configs/sh-defconfig b/misc/buildroot/configs/sh-defconfig
index dcb90bd46..5fc95a5ff 100644
--- a/misc/buildroot/configs/sh-defconfig
+++ b/misc/buildroot/configs/sh-defconfig
@@ -43,7 +43,7 @@ BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
 BR2_DL_DIR="$(BASE_DIR)/../archives"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"