diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-04 22:15:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 22:15:46 +0200 |
| commit | 5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee (patch) | |
| tree | 0e748004387ad33d791977718a100f090b59a5c6 /board/atmel/at91rm9200dk/mux.c | |
| parent | 66932ac3929c7a145a6ef6574a96fd7535154951 (diff) | |
| parent | 03bab0091948196b9558248684c04f60943ca4b5 (diff) | |
| download | u-boot-imx-5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee.zip u-boot-imx-5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee.tar.gz u-boot-imx-5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'board/atmel/at91rm9200dk/mux.c')
| -rw-r--r-- | board/atmel/at91rm9200dk/mux.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c index 767d280..a00563e 100644 --- a/board/atmel/at91rm9200dk/mux.c +++ b/board/atmel/at91rm9200dk/mux.c @@ -4,34 +4,26 @@ #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 */ + 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; - } -#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 */ + 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; -#endif + AT91C_BASE_PIOB->PIO_SODR = CONFIG_SYS_DATAFLASH_MMC_PIO; } 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 */ + 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; -#endif + AT91C_BASE_PIOB->PIO_CODR = CONFIG_SYS_DATAFLASH_MMC_PIO; } |