summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/SOURCES3
-rw-r--r--firmware/drivers/ata.c5
-rw-r--r--firmware/drivers/ata_mmc.c5
3 files changed, 2 insertions, 11 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 63ae6148c2..db3eb42620 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -23,9 +23,10 @@ common/strtok.c
23common/timefuncs.c 23common/timefuncs.c
24debug.c 24debug.c
25drivers/adc.c 25drivers/adc.c
26drivers/ata.c
27#ifdef HAVE_MMC 26#ifdef HAVE_MMC
28drivers/ata_mmc.c 27drivers/ata_mmc.c
28#else
29drivers/ata.c
29#endif 30#endif
30drivers/button.c 31drivers/button.c
31drivers/dac.c 32drivers/dac.c
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 4ba5829f56..62b4fb6d8c 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -30,9 +30,6 @@
30#include "string.h" 30#include "string.h"
31#include "hwcompat.h" 31#include "hwcompat.h"
32 32
33/* skip whole file for an MMC-based system, FIXME in makefile */
34#ifndef HAVE_MMC
35
36#if CONFIG_CPU == SCF5249 33#if CONFIG_CPU == SCF5249
37 34
38/* don't use sh7034 assembler routines */ 35/* don't use sh7034 assembler routines */
@@ -1202,5 +1199,3 @@ int ata_init(void)
1202 1199
1203 return 0; 1200 return 0;
1204} 1201}
1205
1206#endif /* #ifndef HAVE_MMC */
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 7a9a67839d..7a187f092b 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -33,9 +33,6 @@
33 33
34#include "bitswap.h" 34#include "bitswap.h"
35 35
36/* use file for an MMC-based system, FIXME in makefile */
37#ifdef HAVE_MMC
38
39#define SECTOR_SIZE 512 36#define SECTOR_SIZE 512
40 37
41/* Command definitions */ 38/* Command definitions */
@@ -702,5 +699,3 @@ int ata_init(void)
702 return rc; 699 return rc;
703} 700}
704 701
705#endif /* #ifdef HAVE_MMC */
706