aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/src
diff options
context:
space:
mode:
Diffstat (limited to 'os/hal/src')
-rw-r--r--os/hal/src/hal.c7
-rw-r--r--os/hal/src/nand.c2
2 files changed, 2 insertions, 7 deletions
diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c
index 698e1b29b..7cd9e6fb5 100644
--- a/os/hal/src/hal.c
+++ b/os/hal/src/hal.c
@@ -119,11 +119,8 @@ void halInit(void) {
#if HAL_USE_RTC || defined(__DOXYGEN__)
rtcInit();
#endif
-#if HAL_USE_EMC || defined(__DOXYGEN__)
- emcInit();
-#endif
-#if HAL_USE_EMCNAND || defined(__DOXYGEN__)
- emcnandInit();
+#if HAL_USE_NAND || defined(__DOXYGEN__)
+ nandInit();
#endif
/* Board specific initialization.*/
boardInit();
diff --git a/os/hal/src/nand.c b/os/hal/src/nand.c
index c5536f4be..ee2bd3b2d 100644
--- a/os/hal/src/nand.c
+++ b/os/hal/src/nand.c
@@ -242,8 +242,6 @@ void nandObjectInit(NANDDriver *nandp) {
void nandStart(NANDDriver *nandp, const NANDConfig *config) {
osalDbgCheck((nandp != NULL) && (config != NULL));
- osalDbgAssert(config->fsmcp->state == FSMC_READY,
- "lower level driver not ready");
osalDbgAssert((nandp->state == NAND_STOP) ||
(nandp->state == NAND_READY),
"invalid state");