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 merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRdsu-0003yy-HK for barebox@lists.infradead.org; Fri, 26 Oct 2012 06:59:19 +0000 From: Sascha Hauer Date: Fri, 26 Oct 2012 08:58:59 +0200 Message-Id: <1351234748-24994-7-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1351234748-24994-1-git-send-email-s.hauer@pengutronix.de> References: <1351234748-24994-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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: [PATCH 06/15] ARM omap: pbl fixes To: barebox@lists.infradead.org Omap3 pbl build may need omap3_clock.c. Also, do not use add_generic_device in pbl Signed-off-by: Sascha Hauer --- arch/arm/mach-omap/Makefile | 1 + arch/arm/mach-omap/omap3_generic.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile index f752bc7..3a6d50c 100644 --- a/arch/arm/mach-omap/Makefile +++ b/arch/arm/mach-omap/Makefile @@ -23,6 +23,7 @@ pbl-$(CONFIG_ARCH_OMAP3) += omap3_core.o omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o pbl-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o obj-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o +pbl-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o obj-$(CONFIG_SHELL_NONE) += xload.o obj-$(CONFIG_I2C_TWL6030) += omap4_twl6030_mmc.o diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 10eeacd..1e1308e 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -512,6 +512,7 @@ const struct gpmc_config omap3_nand_cfg = { .size = GPMC_SIZE_16M, }; +#ifndef __PBL__ static int omap3_gpio_init(void) { add_generic_device("omap-gpio", 0, NULL, 0x48310000, @@ -530,3 +531,4 @@ static int omap3_gpio_init(void) return 0; } coredevice_initcall(omap3_gpio_init); +#endif -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox