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 <plagnioj@xxxxxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
