mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sanjeev Premi <premi@ti.com>
To: barebox@lists.infradead.org
Subject: [PATCH 1/5] ARM omap: Use updated config option
Date: Wed, 11 Jan 2012 20:27:18 +0530	[thread overview]
Message-ID: <1326293842-3063-2-git-send-email-premi@ti.com> (raw)
In-Reply-To: <s.hauer@pengutronix.de,plagnioj@jcrosoft.com,J.Kilb@phytec.de>

The config option CONFIG_GPMC is renamed to
CONFIG_OMAP_GPMC as result of this commit:
  819f416b86b0d4ad3b6e1ec6375a626aabb96bbd

Still, sources continue to use CONFIG_GPMC.
Fix it.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---

 Did basic boot testing on OMAP3EVM after this
 change.


 arch/arm/boards/omap/board-beagle.c     |    2 +-
 arch/arm/boards/omap/board-omap3evm.c   |    2 +-
 arch/arm/boards/omap/board-sdp343x.c    |    2 +-
 arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index e5f0f94..5f8c2df 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -298,7 +298,7 @@ static int beagle_devices_init(void)
 		add_usb_ehci_device(-1, 0x48064700 + 0x100,
 				    0x48064700 + 0x110, &ehci_pdata);
 #endif /* CONFIG_USB_EHCI_OMAP */
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
 #endif
diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c
index d2f041a..9e96bc8 100644
--- a/arch/arm/boards/omap/board-omap3evm.c
+++ b/arch/arm/boards/omap/board-omap3evm.c
@@ -246,7 +246,7 @@ mem_initcall(omap3evm_mem_init);

 static int omap3evm_init_devices(void)
 {
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/*
 	 * WP is made high and WAIT1 active Low
 	 */
diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c
index d486c20..73aefb2 100644
--- a/arch/arm/boards/omap/board-sdp343x.c
+++ b/arch/arm/boards/omap/board-sdp343x.c
@@ -635,7 +635,7 @@ mem_initcall(sdp3430_mem_init);

 static int sdp3430_devices_init(void)
 {
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
 #endif
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
index 6fe27b7..7b127f3 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
@@ -286,7 +286,7 @@ static void pcaal1_setup_net_chip(void)
 static int pcaal1_mem_init(void)
 {

-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/*
 	 * WP is made high and WAIT1 active Low
 	 */
--
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-01-11 14:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <s.hauer@pengutronix.de,plagnioj@jcrosoft.com,J.Kilb@phytec.de>
2012-01-11 14:57 ` [PATCH 0/5] ARM omap: Some fixes and enhancements Sanjeev Premi
2012-01-11 17:32   ` Premi, Sanjeev
2012-01-11 17:52     ` Premi, Sanjeev
2012-01-11 14:57 ` Sanjeev Premi [this message]
2012-01-11 14:57 ` [PATCH 2/5] ARM omap3beagle: Fix incorrect base addresses Sanjeev Premi
2012-01-11 14:57 ` [PATCH 3/5] ARM omap3evm: Allow building first stage bootloader Sanjeev Premi
2012-01-11 14:57 ` [PATCH 4/5] ARM omap3evm: Enable HSMMC device Sanjeev Premi
2012-01-11 14:57 ` [PATCH 5/5] ARM omap: Set IFT target as MLO Sanjeev Premi

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=1326293842-3063-2-git-send-email-premi@ti.com \
    --to=premi@ti.com \
    --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