diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-03-27 23:26:42 +0100 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-04-04 20:42:19 +0200 |
| commit | 90a92a708d5180a20d600ba0fc2352ec76dc3829 (patch) | |
| tree | cdbded40ed97ff95b138873ead36607791af7993 /board/atmel | |
| parent | 843a2654bce74192de2b5a43474fdc27a572ab40 (diff) | |
| download | bootable_bootloader_goldelico_gta04-90a92a708d5180a20d600ba0fc2352ec76dc3829.zip bootable_bootloader_goldelico_gta04-90a92a708d5180a20d600ba0fc2352ec76dc3829.tar.gz bootable_bootloader_goldelico_gta04-90a92a708d5180a20d600ba0fc2352ec76dc3829.tar.bz2 | |
at91: rename DATAFLASH_MMC_SELECT to CONFIG_DATAFLASH_MMC_SELECT
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/atmel')
| -rw-r--r-- | board/atmel/at91rm9200dk/mux.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c index 767d280..5e03673 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 } |