From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 19 Jun 2014 16:52:58 +0000 (-0600)
Subject: ARM: tegra: fix extlinux.conf search location
X-Git-Tag: v2014.07~74^2~1^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=72638b02f4c380879b0f90b67bcb8d1081dd2eab;p=u-boot

ARM: tegra: fix extlinux.conf search location

extlinux.conf is stored in /boot/extlinux/extlinux.conf rather than
/boot/extlinux.conf. Adjust Tegra's default boot scripts to use the
correct location. This change aligns Tegra's boot scripts with rpi_b.h
and also the location that the Fedora installer actually puts the file.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 76dad4e88c..8cfc17a93c 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -101,13 +101,12 @@
 	\
 	"do_sysboot_boot="                                                \
 		"sysboot ${devtype} ${devnum}:${rootpart} any "           \
-			"${scriptaddr} ${prefix}extlinux.conf\0"          \
+			"${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
 	\
 	"sysboot_boot="                                                   \
 		"if test -e ${devtype} ${devnum}:${rootpart} "            \
-				"${prefix}extlinux.conf; then "           \
-			"echo Found extlinux config "                     \
-				"${prefix}extlinux.conf; "                \
+				"${prefix}extlinux/extlinux.conf; then "  \
+			"echo Found ${prefix}extlinux/extlinux.conf; "    \
 			"run do_sysboot_boot; "                           \
 			"echo SCRIPT FAILED: continuing...; "             \
 		"fi\0"                                                    \