Kinetis and Freedom-K64F: Remove unused configuration variable; fix some compile issues; SDHC is now enabled in the nsh configuration (but does not work)

arch/arm/src/kinetis/Kconfig

@@ -615,13 +615,6 @@ config KINETIS_SD4BIT_FREQ
 		Frequency to use for transferring data to/from an SD card using all four data lines.
 
 endif
-
-config KINETIS_SDHC_DMAPRIO
-	int "SDHC DMA priority"
-	depends on SDIO_DMA
-	---help---
-		SDHC DMA priority
-
 endmenu # Kinetis SDHC Configuration
 
 menu "Kinetis UART Configuration"

arch/arm/src/kinetis/kinetis_sdhc.c

@@ -85,10 +85,6 @@
 #  define CONFIG_KINETIS_SDHC_PRIO NVIC_SYSH_PRIORITY_DEFAULT
 #endif
 
-#ifndef CONFIG_KINETIS_SDHC_DMAPRIO
-#  define CONFIG_KINETIS_SDHC_DMAPRIO DMA_CCR_PRIMED
-#endif
-
 #ifndef CONFIG_DEBUG_MEMCARD_INFO
 #  undef CONFIG_SDIO_XFRDEBUG
 #endif

configs/freedom-k64f/README.txt

@@ -851,3 +851,8 @@ Status
     even at -O1, the system fails to boot.  This seems to be related to the
     watchdog timer.
 
+  2016-07-13:  Add SD automounter logic; broke out SDHC logic into a separate
+    file.  The nsh configuration now has SDHC enabled be default.  Does not
+    yet work.  You might want to disable SDHC and MMC/SD if you are using
+    this configuration.
+ 

configs/freedom-k64f/nsh/defconfig

@@ -140,12 +140,9 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
@@ -218,7 +215,7 @@ CONFIG_KINETIS_UART3=y
 # CONFIG_KINETIS_ADC1 is not set
 # CONFIG_KINETIS_CMP is not set
 # CONFIG_KINETIS_VREF is not set
-# CONFIG_KINETIS_SDHC is not set
+CONFIG_KINETIS_SDHC=y
 # CONFIG_KINETIS_FTM0 is not set
 # CONFIG_KINETIS_FTM1 is not set
 # CONFIG_KINETIS_FTM2 is not set
@@ -239,11 +236,23 @@ CONFIG_KINETIS_UART3=y
 #
 # Kinetis GPIO Interrupt Configuration
 #
-# CONFIG_GPIO_IRQ is not set
+CONFIG_GPIO_IRQ=y
+# CONFIG_KINETIS_PORTAINTS is not set
+# CONFIG_KINETIS_PORTBINTS is not set
+# CONFIG_KINETIS_PORTCINTS is not set
+# CONFIG_KINETIS_PORTDINTS is not set
+CONFIG_KINETIS_PORTEINTS=y
+
+#
+# Kinetis SDHC Configuration
+#
+# CONFIG_KINETIS_SDHC_ABSFREQ is not set
 
 #
 # Kinetis UART Configuration
 #
+CONFIG_SDIO_DMA=y
+# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
 # Architecture Options
@@ -403,6 +412,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -411,6 +421,7 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+CONFIG_SIG_SIGWORK=17
 
 #
 # POSIX Message Queue Options
@@ -422,8 +433,11 @@ CONFIG_MQ_MAXMSGSIZE=32
 #
 # Work queue support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+CONFIG_SCHED_WORKQUEUE=y
-# CONFIG_SCHED_HPWORK is not set
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=224
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=2048
 # CONFIG_SCHED_LPWORK is not set
 
 #
@@ -489,7 +503,18 @@ CONFIG_DEV_NULL=y
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
 # CONFIG_NCP5623C is not set
-# CONFIG_MMCSD is not set
+CONFIG_MMCSD=y
+CONFIG_MMCSD_NSLOTS=1
+# CONFIG_MMCSD_READONLY is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
+# CONFIG_MMCSD_MMCSUPPORT is not set
+CONFIG_MMCSD_HAVECARDDETECT=y
+CONFIG_ARCH_HAVE_SDIO=y
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+CONFIG_MMCSD_SDIO=y
+# CONFIG_SDIO_PREFLIGHT is not set
+# CONFIG_SDIO_MUXBUS is not set
+CONFIG_SDIO_BLOCKSETUP=y
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
@@ -594,8 +619,9 @@ CONFIG_FS_WRITABLE=y
 CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
-# CONFIG_FAT_LCNAMES is not set
+CONFIG_FAT_LCNAMES=y
-# CONFIG_FAT_LFN is not set
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
 # CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
@@ -874,6 +900,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
 CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options

configs/freedom-k64f/src/k64_bringup.c

@@ -43,6 +43,7 @@
 #include <sys/mount.h>
 #include <syslog.h>
 #include <errno.h>
+#include <debug.h>
 
 #include "freedom-k64f.h"
 
@@ -82,10 +83,10 @@ int k64_bringup(void)
 #ifdef HAVE_MMCSD
   /* Initialize the SDHC driver */
 
-  ret = k64_sdhc_initialize(0);
+  ret = k64_sdhc_initialize();
   if (ret < 0)
     {
-      mcerr("ERROR: k64_sdhc_initialize(%d,%d) failed: %d\n", HSMCI0_SLOTNO, 0, ret);
+      mcerr("ERROR: k64_sdhc_initialize() failed: %d\n", ret);
     }
 
 #ifdef CONFIG_FRDMK64F_SDHC_MOUNT

configs/freedom-k64f/src/k64_sdhc.c

@@ -63,6 +63,7 @@
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
+#include <debug.h>
 
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
@@ -157,7 +158,6 @@ static int k64_cdinterrupt(int irq, FAR void *context)
 
 int k64_sdhc_initialize(void)
 {
-  struct k64_sdhc_state_s *state = &g_sdhc;
   int ret;
 
   /* Configure GPIO pins */