mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 06/15] ARM omap: pbl fixes
Date: Fri, 26 Oct 2012 08:58:59 +0200	[thread overview]
Message-ID: <1351234748-24994-7-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1351234748-24994-1-git-send-email-s.hauer@pengutronix.de>

Omap3 pbl build may need omap3_clock.c. Also, do not use add_generic_device
in pbl

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 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

  parent reply	other threads:[~2012-10-26  6:59 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-26  6:58 [PATCH] random compile fixes Sascha Hauer
2012-10-26  6:58 ` [PATCH 01/15] pbl: Add missing FORCE Sascha Hauer
2012-10-26  6:58 ` [PATCH 02/15] wd: Provide default value for watchdog timeout Sascha Hauer
2012-10-26  6:58 ` [PATCH 03/15] mtd: fix mtdraw_write/mtdraw_erase arguments Sascha Hauer
2012-10-26  6:58 ` [PATCH 04/15] ARM: let THUMB2 select EABI Sascha Hauer
2012-10-26  6:58 ` [PATCH 05/15] ARM Samsung: fix pbl build for tiny210 board Sascha Hauer
2012-10-26  6:58 ` Sascha Hauer [this message]
2012-10-26  6:59 ` [PATCH 07/15] ARM Samsung: Let Nand boot depend on ARCH_S3C24xx Sascha Hauer
2012-10-26  6:59 ` [PATCH 08/15] mfd stmpe: Add missing semicolons at end of EXPORT_SYMBOL Sascha Hauer
2012-10-26  6:59 ` [PATCH 09/15] misc JTAG: Let Jtag driver depend on GENERIC_GPIO Sascha Hauer
2012-10-26  6:59 ` [PATCH 10/15] mtd mxs nand: select NAND_BBT Sascha Hauer
2012-10-26  6:59 ` [PATCH 11/15] mtd nand i.MX: fix compilation for unsupported SoC Sascha Hauer
2012-10-26  6:59 ` [PATCH 12/15] of gpio: Build gpio helper only when gpiolib is selected Sascha Hauer
2012-10-26  6:59 ` [PATCH 13/15] pbl: provide hang() function for the pbl Sascha Hauer
2012-10-26  6:59 ` [PATCH 14/15] ARM omap spi image: relax size constrains Sascha Hauer
2012-10-26  6:59 ` [PATCH 15/15] ARM omap spi image: print error to stderr Sascha Hauer

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=1351234748-24994-7-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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