diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-16 16:32:59 +0800 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-17 10:56:24 +0800 |
| commit | 935cdf5a1eadc6411dbdea2c01b4663130c961c8 (patch) | |
| tree | 0685fa747b92c2c9099e29fcc1c3208c2785b52b | |
| parent | 67bb65ad2f9028c365cbfc86eb363ebd63adeeaa (diff) | |
| download | barebox-935cdf5a1eadc6411dbdea2c01b4663130c961c8.tar.gz barebox-935cdf5a1eadc6411dbdea2c01b4663130c961c8.tar.xz | |
move barebox_default_env.h to include/generated/
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common/Makefile | 6 | ||||
| -rw-r--r-- | common/startup.c | 2 | ||||
| -rw-r--r-- | include/.gitignore | 1 |
4 files changed, 5 insertions, 6 deletions
@@ -971,7 +971,7 @@ endif # CONFIG_MODULES # Directories & files removed with 'make clean' CLEAN_DIRS += $(MODVERDIR) -CLEAN_FILES += barebox System.map include/barebox_default_env.h \ +CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.S \ .tmp_kallsyms* barebox_default_env barebox.ldr diff --git a/common/Makefile b/common/Makefile index 4b8cce0d01..fb06a2d847 100644 --- a/common/Makefile +++ b/common/Makefile @@ -20,8 +20,8 @@ obj-$(CONFIG_MODULES) += module.o extra-$(CONFIG_MODULES) += module.lds ifdef CONFIG_DEFAULT_ENVIRONMENT -$(obj)/startup.o: include/barebox_default_env.h -$(obj)/env.o: include/barebox_default_env.h +$(obj)/startup.o: include/generated/barebox_default_env.h +$(obj)/env.o: include/generated/barebox_default_env.h ENV_FILES := $(shell cd $(srctree); for i in $(CONFIG_DEFAULT_ENVIRONMENT_PATH); do find $${i} -type f -exec readlink -f {} \;; done) @@ -30,5 +30,5 @@ endif # ifdef CONFIG_DEFAULT_ENVIRONMENT barebox_default_env: $(ENV_FILES) $(Q)$(srctree)/scripts/genenv $(srctree) $(objtree) $(CONFIG_DEFAULT_ENVIRONMENT_PATH) -include/barebox_default_env.h: barebox_default_env +include/generated/barebox_default_env.h: barebox_default_env $(Q)cat $< | $(objtree)/scripts/bin2c default_environment > $@ diff --git a/common/startup.c b/common/startup.c index 2ed16fea0c..7fa90991ad 100644 --- a/common/startup.c +++ b/common/startup.c @@ -79,7 +79,7 @@ void early_init (void) #endif /* CONFIG_HAS_EARLY_INIT */ #ifdef CONFIG_DEFAULT_ENVIRONMENT -#include <barebox_default_env.h> +#include <generated/barebox_default_env.h> static struct memory_platform_data default_env_platform_data = { .name = "defaultenv", diff --git a/include/.gitignore b/include/.gitignore index bb388cccaa..0e56cf2f8c 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,2 +1 @@ config.h -barebox_default_env.h |