diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c
index 767d28090..5e036736d 100644
--- 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
index 000000000..8a8c3b8f2
--- /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 40bb4a08b..e7e3711e3 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);