env: Fix out of tree building of tools-all

With the move of environment code from common/ to env/ a number of
changes needed to be made to various make targets.  We missed updating
some of the files required for out of tree builds of the tools.  Correct
the 'environ' target to know that we need to work under tools/env/ still
(not tools/environ/) and then update the wrappers in env_attr.c and
env_flags.c to point to the new correct file.

Reported-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Makefile b/Makefile
index 7921625211554516cba7766acae8e5d2792a160c..020ebd50ad2293687f784ed9df45061a69788d0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1466,7 +1466,7 @@ checkarmreloc: u-boot
        fi
 
 environ: scripts_basic
-       $(Q)$(MAKE) $(build)=tools/$@
+       $(Q)$(MAKE) $(build)=tools/env
 
 tools-only: scripts_basic $(version_h) $(timestamp_h)
        $(Q)$(MAKE) $(build)=tools

diff --git a/tools/env/env_attr.c b/tools/env/env_attr.c
index 502d4c900bf2c8ae964408ca785ac59ac7194399..4d8536335c3048930afded434a6d7fa288d57c64 100644 (file)
--- a/tools/env/env_attr.c
+++ b/tools/env/env_attr.c
@@ -1 +1 @@
-#include "../../common/env_attr.c"
+#include "../../env/attr.c"

diff --git a/tools/env/env_flags.c b/tools/env/env_flags.c
index b261cb8e3907284cb2280d0df352da58a891a1f2..71e13e2021f686ae58e79bafbd13fd07a4bae44a 100644 (file)
--- a/tools/env/env_flags.c
+++ b/tools/env/env_flags.c
@@ -1 +1 @@
-#include "../../common/env_flags.c"
+#include "../../env/flags.c"

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 965e1662d702e7d1aa785bd090f5c3af7a62b248..ab06415898c2f718e8a926879379b1f8d74ca55d 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -755,7 +755,7 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count,
 
                /*
                 * If a block is bad, we retry in the next block at the same
-                * offset - see common/env_nand.c::writeenv()
+                * offset - see env/nand.c::writeenv()
                 */
                lseek (fd, blockstart + block_seek, SEEK_SET);