From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 27 Mar 2009 23:30:16 +0100 Subject: [U-Boot] [PATCH 03/13] at91: rename DATAFLASH_MMC_SELECT to CONFIG_DATAFLASH_MMC_SELECT In-Reply-To: <1238193026-12564-2-git-send-email-plagnioj@jcrosoft.com> References: <1238193026-12564-1-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-2-git-send-email-plagnioj@jcrosoft.com> Message-ID: <1238193026-12564-3-git-send-email-plagnioj@jcrosoft.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/atmel/at91rm9200dk/mux.c | 74 ++++++++++++++++++++-------------------- cpu/arm926ejs/at91/.gitignore | 5 +++ include/at45.h | 2 +- 3 files changed, 43 insertions(+), 38 deletions(-) rewrite board/atmel/at91rm9200dk/mux.c (69%) create mode 100644 cpu/arm926ejs/at91/.gitignore diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c dissimilarity index 69% index 767d280..5e03673 100644 --- a/board/atmel/at91rm9200dk/mux.c +++ b/board/atmel/at91rm9200dk/mux.c @@ -1,37 +1,37 @@ -#include -#include -#include -#include - -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 +#include +#include +#include + +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/cpu/arm926ejs/at91/.gitignore b/cpu/arm926ejs/at91/.gitignore new file mode 100644 index 0000000..8a8c3b8 --- /dev/null +++ b/cpu/arm926ejs/at91/.gitignore @@ -0,0 +1,5 @@ +# +# Generated files +# + +/u-boot.lds 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.6.2.1