| From 664ef61e19d6261d8984493b5f22127ec2ad44fc Mon Sep 17 00:00:00 2001 |
| From: Romain Naour <romain.naour@gmail.com> |
| Date: Sun, 10 May 2020 23:15:32 +0200 |
| Subject: [PATCH] tools/env/fw_env.h: remove env.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 an upstream change from uboot [2] adding "#include <env.h>" to |
| fw_env.h. Adding env.h require a board configuration to build. |
| |
| But only fw_env.h header is installed in the staging directory by |
| uboot-tools package, but since it now include env.h the build is broken |
| because env.h is missing from the staging directory. |
| |
| It's seems an upstream bug since env_set() is not used in fw_env tool. |
| |
| Adding env.h is an error since it also include compiler.h (and others |
| uboot internal includes). |
| |
| Nicolas removed env.h from fw_env tool and fixed it's build issue. |
| |
| This problem is present since uboot v2019.10, so the uboot version |
| present in Buildroot 2020.02 is affected. |
| |
| [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> |
| Upstream: https://gitlab.denx.de/u-boot/u-boot/-/commit/2aca8804d8d5f84d2d661e76e8d232c5c12445b5 |
| --- |
| tools/env/fw_env.h | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| 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> |
| |
| /* |
| -- |
| 2.25.4 |
| |
