| Message ID | 20200521212206.2896898-1-romain.naour@gmail.com |
|---|---|
| State | Accepted |
| Commit | 2aca8804d8d5f84d2d661e76e8d232c5c12445b5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | tools/env/fw_env.h: remove env.h | expand |
On Thu, May 21, 2020 at 11:22:06PM +0200, Romain Naour wrote: > As reported by Nicolas Carrier on the Buildroot mailing list [1], > there is a new build issue while building a program which interacts with > the u-boot environment. This program uses the headers of the ubootenv > library provided by uboot-tools. > > This is a recent change from uboot [2] adding "#include <env.h>" to > fw_env.h. Adding env.h require a board configuration to build since > it also include compiler.h (and others uboot internal includes). > > env.h include seems not needed since env_set() is not used in fw_env tool. > > Nicolas removed env.h from fw_env tool and fixed it's build issue. > > This problem is present since uboot v2019.10. > > [1] http://lists.busybox.net/pipermail/buildroot/2020-April/280307.html > [2] https://gitlab.denx.de/u-boot/u-boot/-/commit/9fb625ce05539fe6876a59ce1dcadb76b33c6f6e > > Reported-by: Nicolas Carrier <nicolas.carrier@orolia.com> > Signed-off-by: Romain Naour <romain.naour@gmail.com> Applied to u-boot/master, thanks!
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index b60fbfc8f8..78c803c944 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <env.h> #include <stdint.h> /*
As reported by Nicolas Carrier on the Buildroot mailing list [1], there is a new build issue while building a program which interacts with the u-boot environment. This program uses the headers of the ubootenv library provided by uboot-tools. This is a recent change from uboot [2] adding "#include <env.h>" to fw_env.h. Adding env.h require a board configuration to build since it also include compiler.h (and others uboot internal includes). env.h include seems not needed since env_set() is not used in fw_env tool. Nicolas removed env.h from fw_env tool and fixed it's build issue. This problem is present since uboot v2019.10. [1] http://lists.busybox.net/pipermail/buildroot/2020-April/280307.html [2] https://gitlab.denx.de/u-boot/u-boot/-/commit/9fb625ce05539fe6876a59ce1dcadb76b33c6f6e Reported-by: Nicolas Carrier <nicolas.carrier@orolia.com> Signed-off-by: Romain Naour <romain.naour@gmail.com> --- tools/env/fw_env.h | 1 - 1 file changed, 1 deletion(-)