0001-tools-env-bug-config-structs-must-be-defined-in-tool.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 43cb65b7a00e4759427a6e4b8a02039e43dab5a5 Mon Sep 17 00:00:00 2001
  2. From: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
  3. Date: Fri, 25 Mar 2016 14:52:19 +0100
  4. Subject: [PATCH] tools: env: bug: config structs must be defined in tools
  5. library
  6. fw_senten/fw_printenv can be compiled as a tools library,
  7. excluding the fw_env_main object.
  8. Reported-by: Stefano Babic <sbabic@denx.de>
  9. Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
  10. ---
  11. tools/env/fw_env.c | 4 ++++
  12. tools/env/fw_env_main.c | 4 ----
  13. 2 files changed, 4 insertions(+), 4 deletions(-)
  14. diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
  15. index 5c7505c..1420ac5 100644
  16. --- a/tools/env/fw_env.c
  17. +++ b/tools/env/fw_env.c
  18. @@ -35,6 +35,10 @@
  19. #include "fw_env.h"
  20. +struct common_args common_args;
  21. +struct printenv_args printenv_args;
  22. +struct setenv_args setenv_args;
  23. +
  24. #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
  25. #define min(x, y) ({ \
  26. diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
  27. index 3bec5b9..3706d8f 100644
  28. --- a/tools/env/fw_env_main.c
  29. +++ b/tools/env/fw_env_main.c
  30. @@ -49,10 +49,6 @@ static struct option long_options[] = {
  31. {NULL, 0, NULL, 0}
  32. };
  33. -struct common_args common_args;
  34. -struct printenv_args printenv_args;
  35. -struct setenv_args setenv_args;
  36. -
  37. void usage_printenv(void)
  38. {
  39. --
  40. 2.5.5