From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/9] at91: rename DATAFLASH_MMC_SELECT to CONFIG_SYS_DATAFLASH_MMC_PIO
Date: Tue, 3 Mar 2009 15:07:39 +0100 [thread overview]
Message-ID: <1236089265-24598-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1236089265-24598-2-git-send-email-plagnioj@jcrosoft.com>
and add CONFIG_DATAFLASH_MMC_SELECT to activate it
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
board/atmel/at91rm9200dk/mux.c | 74 ++++++++++++++++++++--------------------
include/at45.h | 2 +-
2 files changed, 38 insertions(+), 38 deletions(-)
rewrite board/atmel/at91rm9200dk/mux.c (69%)
diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c
dissimilarity index 69%
index 767d280..8319142 100644
--- a/board/atmel/at91rm9200dk/mux.c
+++ b/board/atmel/at91rm9200dk/mux.c
@@ -1,37 +1,37 @@
-#include <config.h>
-#include <common.h>
-#include <asm/hardware.h>
-#include <dataflash.h>
-
-int AT91F_GetMuxStatus(void) {
-#ifdef DATAFLASH_MMC_SELECT
- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */
- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */
-
-
- if(AT91C_BASE_PIOB->PIO_ODSR & DATAFLASH_MMC_SELECT) {
- return 1;
- } else {
- return 0;
- }
-#endif
- return 0;
-}
-
-void AT91F_SelectMMC(void) {
-#ifdef DATAFLASH_MMC_SELECT
- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */
- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */
- /* Set Output */
- AT91C_BASE_PIOB->PIO_SODR = DATAFLASH_MMC_SELECT;
-#endif
-}
-
-void AT91F_SelectSPI(void) {
-#ifdef DATAFLASH_MMC_SELECT
- AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */
- AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */
- /* Clear Output */
- AT91C_BASE_PIOB->PIO_CODR = DATAFLASH_MMC_SELECT;
-#endif
-}
+#include <config.h>
+#include <common.h>
+#include <asm/hardware.h>
+#include <dataflash.h>
+
+int AT91F_GetMuxStatus(void) {
+#ifdef CONFIG_DATAFLASH_MMC_SELECT
+ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */
+ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */
+
+
+ if(AT91C_BASE_PIOB->PIO_ODSR & CONFIG_SYS_DATAFLASH_MMC_PIO) {
+ return 1;
+ } else {
+ return 0;
+ }
+#endif
+ return 0;
+}
+
+void AT91F_SelectMMC(void) {
+#ifdef CONFIG_DATAFLASH_MMC_SELECT
+ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */
+ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */
+ /* Set Output */
+ AT91C_BASE_PIOB->PIO_SODR = CONFIG_SYS_DATAFLASH_MMC_PIO;
+#endif
+}
+
+void AT91F_SelectSPI(void) {
+#ifdef CONFIG_DATAFLASH_MMC_SELECT
+ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */
+ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */
+ /* Clear Output */
+ AT91C_BASE_PIOB->PIO_CODR = CONFIG_SYS_DATAFLASH_MMC_PIO;
+#endif
+}
diff --git a/include/at45.h b/include/at45.h
index 40bb4a0..e7e3711 100644
--- a/include/at45.h
+++ b/include/at45.h
@@ -1,7 +1,7 @@
#ifndef _AT45_H_
#define _AT45_H_
-#ifdef DATAFLASH_MMC_SELECT
+#ifdef CONFIG_DATAFLASH_MMC_SELECT
extern void AT91F_SelectMMC(void);
extern void AT91F_SelectSPI(void);
extern int AT91F_GetMuxStatus(void);
--
1.5.6.5
next prev parent reply other threads:[~2009-03-03 14:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-03 14:07 [U-Boot] [PATCH 1/9] at91sam9/cap9: use define instead hardcoded value for the USB_OHCI_REGS_BASE Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 2/9] AT91RM9200EK: fix broken boot from NOR flash Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2009-03-03 14:07 ` [U-Boot] [PATCH 4/9] at91rm9200dk: Move conditional compilation to Makefile Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 5/9] Add support for the AT91RM9200EK Board Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 6/9] at91rm9200: move serial driver to drivers/serial Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 7/9] at91rm9200: fix DCC support Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 8/9] at91sam9263ek add dcc support with at91sam9263ek_dcc_config Jean-Christophe PLAGNIOL-VILLARD
2009-03-03 14:07 ` [U-Boot] [PATCH 9/9] at91rm9200ek: add dcc support with at91rm9200ek_dcc_config Jean-Christophe PLAGNIOL-VILLARD
2009-03-08 23:28 ` Wolfgang Denk
2009-03-08 23:33 ` [U-Boot] [PATCH 8/9] at91sam9263ek add dcc support with at91sam9263ek_dcc_config Wolfgang Denk
2009-03-09 8:35 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 11:19 ` Wolfgang Denk
2009-03-08 23:31 ` [U-Boot] [PATCH 7/9] at91rm9200: fix DCC support Wolfgang Denk
2009-03-09 8:36 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 11:19 ` Wolfgang Denk
2009-03-09 11:18 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 11:37 ` Wolfgang Denk
2009-03-09 12:09 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 15:50 ` Wolfgang Denk
2009-03-09 17:12 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 19:45 ` Wolfgang Denk
2009-03-08 23:26 ` [U-Boot] [PATCH 5/9] Add support for the AT91RM9200EK Board Wolfgang Denk
2009-03-09 8:37 ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-09 11:19 ` Wolfgang Denk
2009-03-08 23:21 ` [U-Boot] [PATCH 1/9] at91sam9/cap9: use define instead hardcoded value for the USB_OHCI_REGS_BASE Wolfgang Denk
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=1236089265-24598-3-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.