From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1P46vX-0006go-Jb for barebox@lists.infradead.org; Fri, 08 Oct 2010 06:59:36 +0000 Date: Fri, 8 Oct 2010 08:59:33 +0200 From: Sascha Hauer Message-ID: <20101008065933.GM28242@pengutronix.de> References: <1286469458-11362-1-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1286469458-11362-1-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/5] defaultenv: introduce CONFIG_DEFAULT_ENVIRONMENT_GENERIC to enable it To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Thu, Oct 07, 2010 at 06:37:34PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > this will we usefull to enable functionnality if used > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > arch/arm/configs/neso_defconfig | 3 ++- > arch/arm/configs/pca100_defconfig | 3 ++- > arch/arm/configs/pcm037_defconfig | 3 ++- > arch/arm/configs/pcm038_defconfig | 3 ++- > arch/arm/configs/pcm043_defconfig | 3 ++- > common/Kconfig | 7 +++++++ > common/Makefile | 4 ++++ > 7 files changed, 21 insertions(+), 5 deletions(-) > > > +config DEFAULT_ENVIRONMENT_GENERIC > + bool > + depends on DEFAULT_ENVIRONMENT > + prompt "Default environment generic" > + help > + Generic barebox default env How about a bit more verbosity: prompt "Add generic default environment" help With this option barebox will use the generic default environment found under defaultenv/ in the src tree. The Directory given with DEFAULT_ENVIRONMENT_PATH will be added to the default environment. This should at least contain a /env/config file. > + > config DEFAULT_ENVIRONMENT_PATH > string > depends on DEFAULT_ENVIRONMENT > diff --git a/common/Makefile b/common/Makefile > index e56dbc2..b42ab7a 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -26,6 +26,10 @@ ifdef CONFIG_DEFAULT_ENVIRONMENT > $(obj)/startup.o: include/generated/barebox_default_env.h > $(obj)/env.o: include/generated/barebox_default_env.h > > +ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_GENERIC),y) > +CONFIG_DEFAULT_ENVIRONMENT_PATH += defaultenv > +endif This reverses the order the different environment directories are parsed. Now the files from defaultenv will overwrite the ones from DEFAULT_ENVIRONMENT_PATH. I made it intentionally the other way round. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox