diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-09 20:20:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-12 18:40:02 +0200 |
| commit | 68e3e14a64693f7b601c0d5599dc9fbb3133bdcc (patch) | |
| tree | fd961d6e6a0c922c8f3697eeacefc1bf5a2091a5 /common/startup.c | |
| parent | ca2520ed55906028854b1cca93fff7e7ab25a518 (diff) | |
| download | barebox-68e3e14a64693f7b601c0d5599dc9fbb3133bdcc.tar.gz barebox-68e3e14a64693f7b601c0d5599dc9fbb3133bdcc.tar.xz | |
defaultenv: dependencies fixes
When a build with a compressed default environment is done and then
environment compression is disabled, barebox_default_env.h is not
regenerated because its dependency (now barebox_default_env) is still
up to date. This results in a corrupt default environment.
This patch fixes this by adding a cmd_env_h and changing barebox_default_env.h
to FORCE. As a side effect barebox_default_env.h is no longer generated in
include/generated/ but in common/ as we have to add barebox_default_env.h to
$(targets) (extra-y).
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/startup.c b/common/startup.c index b53bbef840..78926c9963 100644 --- a/common/startup.c +++ b/common/startup.c @@ -39,7 +39,7 @@ extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], __barebox_initcalls_end[]; #ifdef CONFIG_DEFAULT_ENVIRONMENT -#include <generated/barebox_default_env.h> +#include "barebox_default_env.h" #ifdef CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED #include <uncompress.h> |