diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2008-11-11 14:11:49 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2008-11-11 14:11:49 +0000 |
| commit | e86d651647fa3e2a4302ccb82c7d9d22bb2c70e5 (patch) | |
| tree | 4f5f63b997c8e2e07f82751d49c7c913e4bd3a97 | |
| parent | 8e90c0f1ed81b2afc3917a9d3b582ac8466b2a51 (diff) | |
| download | rockbox-e86d651647fa3e2a4302ccb82c7d9d22bb2c70e5.zip rockbox-e86d651647fa3e2a4302ccb82c7d9d22bb2c70e5.tar.gz rockbox-e86d651647fa3e2a4302ccb82c7d9d22bb2c70e5.tar.bz2 rockbox-e86d651647fa3e2a4302ccb82c7d9d22bb2c70e5.tar.xz | |
make the meizu bootloaders compile again with the new storage infrastructure
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19088 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/SOURCES | 7 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8700/ata-nand-s5l8700.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 0065749..f43f331 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -111,10 +111,12 @@ drivers/serial.c #ifndef SIMULATOR #if (CONFIG_STORAGE & STORAGE_MMC) drivers/ata_mmc.c -#elif (CONFIG_STORAGE & STORAGE_NAND) && (CONFIG_NAND & NAND_IFP7XX) +#elif (CONFIG_STORAGE & STORAGE_NAND) && (CONFIG_NAND == NAND_IFP7XX) drivers/ata_flash.c -#elif (CONFIG_STORAGE & STORAGE_NAND) && (CONFIG_NAND & NAND_TCC) +#elif (CONFIG_STORAGE & STORAGE_NAND) && (CONFIG_NAND == NAND_TCC) target/arm/ata-nand-telechips.c +#elif (CONFIG_STORAGE & STORAGE_NAND) && (CONFIG_NAND == NAND_SAMSUNG) +target/arm/s5l8700/ata-nand-s5l8700.c #elif (CONFIG_STORAGE & STORAGE_ATA) drivers/ata.c #elif (CONFIG_STORAGE & STORAGE_RAMDISK) @@ -1139,7 +1141,6 @@ target/arm/tcc780x/cowond2/audio-cowond2.c #if CONFIG_CPU==S5L8700 target/arm/s5l8700/system-s5l8700.c -target/arm/s5l8700/ata-nand-s5l8700.c #endif #ifdef MEIZU_M6SL diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c index 4d42a63..8c66c14 100644 --- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c +++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c @@ -18,9 +18,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#include "ata.h" -#include "ata-target.h" -#include "nand_idle_notify.h" +#include "nand.h" +#include "ata_idle_notify.h" #include "system.h" #include <string.h> #include "thread.h" |