at91: rename DATAFLASH_MMC_SELECT to CONFIG_DATAFLASH_MMC_SELECT

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c
index 767d28090d18e757b4df80fed6aa05017072acd6..5e036736df51bf1ebdd0bfbdc7023ddf58874980 100644 (file)
--- a/board/atmel/at91rm9200dk/mux.c
+++ b/board/atmel/at91rm9200dk/mux.c
@@ -4,12 +4,12 @@
 #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 */
+#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 & DATAFLASH_MMC_SELECT) {
+       if(AT91C_BASE_PIOB->PIO_ODSR & CONFIG_SYS_DATAFLASH_MMC_PIO) {
                return 1;
        } else {
                return 0;
@@ -19,19 +19,19 @@ int AT91F_GetMuxStatus(void) {
 }
 
 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 */
+#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 = DATAFLASH_MMC_SELECT;
+       AT91C_BASE_PIOB->PIO_SODR = CONFIG_SYS_DATAFLASH_MMC_PIO;
 #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 */
+#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 = DATAFLASH_MMC_SELECT;
+       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 (file)
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 40bb4a08bd4a425331962546e33ca4cd93406859..e7e3711e3b5c02bd9a4b4082d1c4b77adf8589f1 100644 (file)
--- 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);