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

2 files changed, 6 insertions, 6 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 0065749088..f43f331df7 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 4d42a63d9b..8c66c14db5 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"