mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 5/5] move barebox_default_env.h to include/generated/
Date: Fri, 17 Sep 2010 06:40:36 +0200	[thread overview]
Message-ID: <1284698436-1097-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1284698436-1097-1-git-send-email-plagnioj@jcrosoft.com>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 Makefile           |    2 +-
 common/Makefile    |    6 +++---
 common/startup.c   |    2 +-
 include/.gitignore |    1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c990005..3a97a26 100644
--- a/Makefile
+++ b/Makefile
@@ -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 4b8cce0..fb06a2d 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 2ed16fe..7fa9099 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 bb388cc..0e56cf2 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,2 +1 @@
 config.h
-barebox_default_env.h
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2010-09-17  4:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-17  4:40 [PATCH 1/5] gitignore: update generated link and file Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` [PATCH 2/5] move version.h to include/generated/ instead of include/linux Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` [PATCH 3/5] move utsrelease.h " Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` [PATCH 4/5] arm: move mach-types.h to include/generated/ Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` Jean-Christophe PLAGNIOL-VILLARD [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284698436-1097-5-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox