From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from [2001:6f8:1178:4:290:27ff:fe1d:cc33] (helo=metis.ext.pengutronix.de) by casper.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1NMiEE-0004Ct-VL for barebox@lists.infradead.org; Mon, 21 Dec 2009 13:23:16 +0000 Date: Mon, 21 Dec 2009 14:22:16 +0100 From: Sascha Hauer Message-ID: <20091221132216.GH15126@pengutronix.de> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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] Remove/adjust erroneous references to CONFIG_MODULE. To: "Robert P. J. Day" Cc: "U-Boot Version 2 (barebox)" On Mon, Dec 21, 2009 at 07:07:04AM -0500, Robert P. J. Day wrote: > > The correct config variable is CONFIG_MODULES, so tweak any references > to the incorrect CONFIG_MODULE. > > Signed-off-by: Robert P. J. Day Ok, applied Sascha > > --- > > can someone verify that this looks correct, as there are only three > references to CONFIG_MODULE throughout the tree: > > * a superfluous one in common/Makefile that's already covered by > a test to CONFIG_MODULES > * a test in arch/ppc/Makefile > * a comment in include/module.h > > so i want to make sure i tweaked all that appropriately. > > > diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile > index 2c9c535..c24d3c3 100644 > --- a/arch/ppc/Makefile > +++ b/arch/ppc/Makefile > @@ -17,7 +17,7 @@ TEXT_BASE = $(CONFIG_TEXT_BASE) > CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P > > # Add cleanup flags > -ifndef CONFIG_MODULE > +ifndef CONFIG_MODULES > CPPFLAGS += -fdata-sections -ffunction-sections > endif > > diff --git a/common/Makefile b/common/Makefile > index d7a024b..0c075a9 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -2,7 +2,6 @@ obj-$(CONFIG_SHELL_HUSH) += hush.o > obj-$(CONFIG_SHELL_SIMPLE) += parser.o > obj-$(CONFIG_GREGORIAN_CALENDER) += date.o > obj-$(CONFIG_OF_FLAT_TREE) += ft_build.o > -obj-$(CONFIG_MODULE) += module.o > obj-$(CONFIG_KALLSYMS) += kallsyms.o > obj-$(CONFIG_ENV_HANDLING) += environment.o > obj-$(CONFIG_AUTO_COMPLETE) += complete.o > diff --git a/include/module.h b/include/module.h > index 03b226a..9d0e803 100644 > --- a/include/module.h > +++ b/include/module.h > @@ -71,7 +71,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, > struct module *mod); > #else > #define EXPORT_SYMBOL(sym) > -#endif /* CONFIG_MODULE */ > +#endif /* CONFIG_MODULES */ > > extern struct list_head module_list; > > > ======================================================================== > Robert P. J. Day Waterloo, Ontario, CANADA > > Linux Consulting, Training and Kernel Pedantry. > > Web page: http://crashcourse.ca > Twitter: http://twitter.com/rpjday > ======================================================================== > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- 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