rename back without f7

arch/arm/src/stm32f7/Make.defs

@@ -51,7 +51,7 @@ CMN_CSRCS += up_mdelay.c up_udelay.c up_exit.c up_idle.c up_initialize.c
 CMN_CSRCS += up_initialstate.c up_interruptcontext.c up_memfault.c up_modifyreg8.c
 CMN_CSRCS += up_modifyreg16.c up_modifyreg32.c up_releasepending.c
 CMN_CSRCS += up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c
-CMN_CSRCS += up_sigdeliver.c up_stackframe.c up_unblocktask.c up_usestack.c
+CMN_CSRCS += up_sigdeliver.c up_stackframe.c up_systemreset.c up_unblocktask.c up_usestack.c
 CMN_CSRCS += up_doirq.c up_hardfault.c up_svcall.c up_vfork.c
 
 # Configuration-dependent common files

arch/arm/src/stm32f7/chip.h

@@ -49,6 +49,7 @@
 #include <arch/irq.h>
 #include <arch/stm32f7/chip.h>
 #include "chip/stm32_memorymap.h"
+#include "chip/stm32_pinmap.h"
 
 /* If the common ARMv7-M vector handling logic is used, then it expects the
  * following definition in this file that provides the number of supported external

arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h

@@ -82,6 +82,7 @@
 
 
 #define STM32_SYSMEM_AXIM    0x1ff00000     /* 0x1ff00000-0x1ff0edbf: System memory (AXIM) */
+#define STM32_SYSMEM_UID     0x1ff0f420     /* The 96-bit unique device identifier */
 #define STM32_OTP_ICTM       0x0010f000     /* 0x0010f000-0x0010edbf: OTP (ITCM) */
 #define STM32_OTP_AXIM       0x1ff0f000     /* 0x1ff00000-0x1ff0f41f: OTP (AXIM) */
 
@@ -207,5 +208,7 @@
  * address range
  */
 
+#define STM32_DEBUGMCU_BASE 0xe0042000
+ 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
 #endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H */

arch/arm/src/stm32f7/chip/stm32f74xx75xx_spi.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f7_spi.h
+ * arch/arm/src/stm32f7/chip/stm32f74xx75xx_spi.h
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

arch/arm/src/stm32f7/stm32_i2c.c

@@ -2485,7 +2485,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
  *
  ************************************************************************************/
 
-FAR struct i2c_master_s *stm32f7_i2cbus_initialize(int port)
+FAR struct i2c_master_s *stm32_i2cbus_initialize(int port)
 {
   struct stm32_i2c_priv_s * priv = NULL;  /* private data of device with multiple instances */
   struct stm32_i2c_inst_s * inst = NULL;  /* device, single instance */
@@ -2559,7 +2559,7 @@ FAR struct i2c_master_s *stm32f7_i2cbus_initialize(int port)
  *
  ************************************************************************************/
 
-int stm32f7_i2cbus_uninitialize(FAR struct i2c_master_s * dev)
+int stm32_i2cbus_uninitialize(FAR struct i2c_master_s * dev)
 {
   int irqs;
 

arch/arm/src/stm32f7/stm32_i2c.h

@@ -66,7 +66,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32f7_i2cbus_initialize
+ * Name: stm32_i2cbus_initialize
  *
  * Description:
  *   Initialize the selected I2C port. And return a unique instance of struct
@@ -82,16 +82,16 @@
  *
  ****************************************************************************/
 
-FAR struct i2c_master_s *stm32f7_i2cbus_initialize(int port);
+FAR struct i2c_master_s *stm32_i2cbus_initialize(int port);
 
 /****************************************************************************
- * Name: stm32f7_i2cbus_uninitialize
+ * Name: stm32_i2cbus_uninitialize
  *
  * Description:
  *   De-initialize the selected I2C port, and power down the device.
  *
  * Input Parameter:
- *   Device structure as returned by the stm32f7_i2cbus_initialize()
+ *   Device structure as returned by the stm32_i2cbus_initialize()
  *
  * Returned Value:
  *   OK on success, ERROR when internal reference count mismatch or dev
@@ -99,6 +99,6 @@ FAR struct i2c_master_s *stm32f7_i2cbus_initialize(int port);
  *
  ****************************************************************************/
 
-int stm32f7_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
+int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
 
 #endif /* __ARCH_ARM_SRC_STM32F7_STM32F7_I2C_H */

arch/arm/src/stm32f7/stm32_spi.h

@@ -72,7 +72,7 @@ enum    spi_dev_e;
  ************************************************************************************/
 
 /************************************************************************************
- * Name: stm32f7_spibus_initialize
+ * Name: stm32_spibus_initialize
  *
  * Description:
  *   Initialize the selected SPI bus
@@ -85,31 +85,31 @@ enum    spi_dev_e;
  *
  ************************************************************************************/
 
-FAR struct spi_dev_s *stm32f7_spibus_initialize(int bus);
+FAR struct spi_dev_s *stm32_spibus_initialize(int bus);
 
 /************************************************************************************
- * Name:  stm32f7_spi1/2/...select and stm32f7_spi1/2/...status
+ * Name:  stm32_spi1/2/...select and stm32_spi1/2/...status
  *
  * Description:
- *   The external functions, stm32f7_spi1/2/...select, stm32f7_spi1/2/...status, and
+ *   The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status, and
- *   stm32f7_spi1/2/...cmddata must be provided by board-specific logic.  These are
+ *   stm32_spi1/2/...cmddata must be provided by board-specific logic.  These are
  *   implementations of the select, status, and cmddata methods of the SPI interface
  *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
- *   (including stm32f7_spibus_initialize()) are provided by common STM32 logic.  To use this
+ *   (including stm32_spibus_initialize()) are provided by common STM32 logic.  To use this
  *   common SPI logic on your board:
  *
- *   1. Provide logic in stm32f7_boardinitialize() to configure SPI chip select
+ *   1. Provide logic in stm32_boardinitialize() to configure SPI chip select
  *      pins.
- *   2. Provide stm32f7_spi1/2/...select() and stm32f7_spi1/2/...status() functions in your
+ *   2. Provide stm32_spi1/2/...select() and stm32_spi1/2/...status() functions in your
  *      board-specific logic.  These functions will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
  *   3. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration file, then
- *      provide stm32f7_spi1/2/...cmddata() functions in your board-specific logic.
+ *      provide stm32_spi1/2/...cmddata() functions in your board-specific logic.
  *      These functions will perform cmd/data selection operations using GPIOs in the
  *      way your board is configured.
- *   4. Add a calls to stm32f7_spibus_initialize() in your low level application
+ *   4. Add a calls to stm32_spibus_initialize() in your low level application
  *      initialization logic
- *   5. The handle returned by stm32f7_spibus_initialize() may then be used to bind the
+ *   5. The handle returned by stm32_spibus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
@@ -117,43 +117,43 @@ FAR struct spi_dev_s *stm32f7_spibus_initialize(int bus);
  ************************************************************************************/
 
 #ifdef CONFIG_STM32F7_SPI1
-void stm32f7_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI2
-void stm32f7_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI3
-void stm32f7_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI4
-void stm32f7_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI5
-void stm32f7_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI6
-void stm32f7_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void stm32_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t stm32f7_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int stm32f7_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 /************************************************************************************
- * Name: stm32f7_spi1/2/...register
+ * Name: stm32_spi1/2/...register
  *
  * Description:
  *   If the board supports a card detect callback to inform the SPI-based MMC/SD
@@ -174,32 +174,32 @@ int stm32f7_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 
 #ifdef CONFIG_SPI_CALLBACK
 #ifdef CONFIG_STM32F7_SPI1
-int stm32f7_spi1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI2
-int stm32f7_spi2register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi2register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI3
-int stm32f7_spi3register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi3register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI4
-int stm32f7_spi4register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi4register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI5
-int stm32f7_spi5register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi5register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_STM32F7_SPI6
-int stm32f7_spi6register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
+int stm32_spi6register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 #endif

configs/stm32f746-ws/src/stm32_appinitialize.c

@@ -47,12 +47,12 @@
 #include "stm32f746-ws.h"
 #include "stm32_i2c.h"
 
-static void stm32f7_i2c_register(int bus)
+static void stm32_i2c_register(int bus)
 {
   FAR struct i2c_master_s *i2c;
   int ret;
 
-  i2c = stm32f7_i2cbus_initialize(bus);
+  i2c = stm32_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
       dbg("ERROR: Failed to get I2C%d interface\n", bus);
@@ -63,14 +63,14 @@ static void stm32f7_i2c_register(int bus)
       if (ret < 0)
         {
           dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
-          stm32f7_i2cbus_uninitialize(i2c);
+          stm32_i2cbus_uninitialize(i2c);
         }
     }
 }
 
-static void stm32f7_i2ctool(void)
+static void stm32_i2ctool(void)
 {
-  stm32f7_i2c_register(1);
+  stm32_i2c_register(1);
 }
 
 /****************************************************************************
@@ -91,7 +91,7 @@ int board_app_initialize(void)
 {
   /* Register I2C drivers on behalf of the I2C tool */
 
-  stm32f7_i2ctool();
+  stm32_i2ctool();
 
   return OK;
 }

configs/stm32f746-ws/src/stm32_spi.c

@@ -116,72 +116,72 @@ void weak_function stm32_spidev_initialize(void)
  ****************************************************************************/
 
 #ifdef CONFIG_STM32F7_SPI1
-void stm32f7_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI2
-void stm32f7_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI3
-void stm32f7_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI4
-void stm32f7_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI5
-void stm32f7_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI6
-void stm32f7_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void stm32_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
-uint8_t stm32f7_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
@@ -212,42 +212,42 @@ uint8_t stm32f7_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 #ifdef CONFIG_SPI_CMDDATA
 #ifdef CONFIG_STM32F7_SPI1
-int stm32f7_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI2
-int stm32f7_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI3
-int stm32f7_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI4
-int stm32f7_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI5
-int stm32f7_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }
 #endif
 
 #ifdef CONFIG_STM32F7_SPI6
-int stm32f7_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   return -ENODEV;
 }