Merge branch 'master' into l432kc

configs/photon/include/board.h

@@ -237,6 +237,17 @@
 #  define SDIO_SDXFR_CLKDIV     (2 << SDIO_CLKCR_CLKDIV_SHIFT)
 #endif
 
+/* DMA Channl/Stream Selections *****************************************************/
+/* Stream selections are arbitrary for now but might become important in the future
+ * if we set aside more DMA channels/streams.
+ *
+ * SDIO DMA
+ *   DMAMAP_SDIO_1 = Channel 4, Stream 3
+ *   DMAMAP_SDIO_2 = Channel 4, Stream 6
+ */
+
+#define DMAMAP_SDIO DMAMAP_SDIO_1
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/

configs/photon/nsh/Make.defs

@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 ifeq ($(CONFIG_PHOTON_DFU_BOOTLOADER),y)
 LDSCRIPT = photon_dfu.ld
 else
-LDSCRIPT = ld.script
+LDSCRIPT = photon_jtag.ld
 endif
 
 ifeq ($(WINTOOL),y)
@@ -68,6 +68,11 @@ NM = $(ARCROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
+# See http://dfu-util.sourceforge.net/
+
+DFUSUFFIX = dfu-suffix
+DFUUTIL = dfu-util
+
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
@@ -114,3 +119,21 @@ HOSTCC = gcc
 HOSTINCLUDES = -I.
 HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
 HOSTLDFLAGS =
+
+ifeq ($(CONFIG_DFU_BINARY),y)
+
+define DOWNLOAD
+  $(Q) echo "DFUSUFFIX: $(1).dfu"
+  $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(1) $(1).dfu
+  $(Q) $(DFUSUFFIX) -v $(subst 0x,,$(CONFIG_DFU_VID)) -p $(subst 0x,,$(CONFIG_DFU_PID)) -a $(1).dfu
+  $(Q) $(DFUUTIL) -d $(CONFIG_DFU_VID):$(CONFIG_DFU_PID) -a 0 -s $(CONFIG_DFU_BASE) -D $(1).dfu
+endef
+
+else
+
+define DOWNLOAD
+  $(Q) $(ECHO) "Photon firmware upload through JTAG is not supported"
+endef
+
+endif
+

configs/photon/scripts/photon_dfu.ld

@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /* The STM32F205RG has 1024Kb of FLASH beginning at address 0x0800:0000 and
- * 112Kb of SRAM.
+ * 112Kb of SRAM in main SRAM1 and 16 Kb in auxiliary SRAM2.
  *
  * Bootloader jumps at 0x0802:0000.
  */
@@ -61,6 +61,16 @@ SECTIONS
 		*(.text .text.*)
 		*(.fixup)
 		*(.gnu.warning)
+
+        . = ALIGN(0x4);
+        wlan_firmware_image_location = .;
+        *(.wlan_firmware_image .wlan_firmware_image.*)
+        wlan_firmware_image_end = .;
+        . = ALIGN(0x4);
+        wlan_nvram_image_location = .;
+        *(.wlan_nvram_image .wlan_nvram_image.*)
+        wlan_nvram_image_end = .;
+
 		*(.rodata .rodata.*)
 		*(.gnu.linkonce.t.*)
 		*(.glue_7)

configs/photon/scripts/photon_jtag.ld

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/photon/scripts/ld.script
+ * configs/photon/scripts/photon_jtag.ld
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /* The STM32F205RG has 1024Kb of FLASH beginning at address 0x0800:0000 and
- * 112Kb of SRAM.
+ * 112Kb of SRAM in main SRAM1 and 16 Kb in auxiliary SRAM2.
  *
  * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
  * where the code expects to begin execution by jumping to the entry point in

configs/photon/src/Makefile

@@ -61,6 +61,7 @@ endif
 
 ifeq ($(CONFIG_PHOTON_WLAN),y)
 CSRCS += stm32_wlan.c
+CSRCS += stm32_wlan_firmware.c
 endif
 
 ifeq ($(CONFIG_STM32_OTGHS),y)

configs/photon/src/stm32_wlan.c

@@ -98,6 +98,24 @@ void bcmf_board_initialize(int minor)
   bcmf_board_reset(minor, true);
 }
 
+/****************************************************************************
+ * Name: bcmf_board_setup_oob_irq
+ ****************************************************************************/
+
+void bcmf_board_setup_oob_irq(int minor, xcpt_t func, void *arg)
+{
+  if (minor != SDIO_WLAN0_MINOR)
+    {
+      return;
+    }
+
+  /* Configure interrupt pin */
+
+  stm32_configgpio(GPIO_WLAN0_OOB_INT);
+
+  stm32_gpiosetevent(GPIO_WLAN0_OOB_INT, true, false, false, func, arg);
+}
+
 /****************************************************************************
  * Name: photon_wlan_initialize
  ****************************************************************************/

configs/photon/usbnsh/Make.defs

@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 ifeq ($(CONFIG_PHOTON_DFU_BOOTLOADER),y)
 LDSCRIPT = photon_dfu.ld
 else
-LDSCRIPT = ld.script
+LDSCRIPT = photon_jtag.ld
 endif
 
 ifeq ($(WINTOOL),y)

configs/photon/wlan/Make.defs

@@ -0,0 +1,139 @@
+############################################################################
+# configs/photon/wlan/Make.defs
+#
+#   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+ifeq ($(CONFIG_PHOTON_DFU_BOOTLOADER),y)
+LDSCRIPT = photon_dfu.ld
+else
+LDSCRIPT = photon_jtag.ld
+endif
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+# See http://dfu-util.sourceforge.net/
+
+DFUSUFFIX = dfu-suffix
+DFUUTIL = dfu-util
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
+ifeq ($(CONFIG_DFU_BINARY),y)
+
+define DOWNLOAD
+  $(Q) echo "DFUSUFFIX: $(1).dfu"
+  $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(1) $(1).dfu
+  $(Q) $(DFUSUFFIX) -v $(subst 0x,,$(CONFIG_DFU_VID)) -p $(subst 0x,,$(CONFIG_DFU_PID)) -a $(1).dfu
+  $(Q) $(DFUUTIL) -d $(CONFIG_DFU_VID):$(CONFIG_DFU_PID) -a 0 -s $(CONFIG_DFU_BASE) -D $(1).dfu
+endef
+
+else
+
+define DOWNLOAD
+  $(Q) $(ECHO) "Photon firmware upload through JTAG is not supported"
+endef
+
+endif
+