Make STM32F7 target code more generic

Allow missing Ethernet, different flash configurations

Author: bakatrouble

connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/stm32f7_eth_conf.c

@@ -17,6 +17,8 @@
 
 #include "stm32f7xx_hal.h"
 
+#if defined ETH
+
 void _eth_config_mac(ETH_HandleTypeDef *heth)
 {
     ETH_MACInitTypeDef macconf = {
@@ -59,3 +61,5 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
 
     (void) HAL_ETH_ConfigMAC(heth, &macconf);
 }
+
+#endif // defined ETH

targets/TARGET_STM/TARGET_STM32F7/flash_api.c

@@ -206,13 +206,37 @@ static uint32_t GetSector(uint32_t address)
         sector += 16 + (tmp >> 17);
     }
 #else // SINGLE BANK
-    if (address < ADDR_FLASH_SECTOR_4) { // Sectors 0 to 3
-        sector += tmp >> 15;
-    } else if (address < ADDR_FLASH_SECTOR_5) { // Sector 4
-        sector += FLASH_SECTOR_4;
-    } else { // Sectors 5 to 11
-        sector += 4 + (tmp >> 18);
+    if (address < ADDR_FLASH_SECTOR_1) {
+        sector = 0;
+    } else if (address < ADDR_FLASH_SECTOR_2) {
+        sector = 1;
+    } else if (address < ADDR_FLASH_SECTOR_3) {
+        sector = 2;
+    } else if (address < ADDR_FLASH_SECTOR_4) {
+        sector = 3;
+    } else if (address < ADDR_FLASH_SECTOR_5) {
+        sector = 4;
+    } else if (address < ADDR_FLASH_SECTOR_6) {
+        sector = 5;
+    } else if (address < ADDR_FLASH_SECTOR_7) {
+        sector = 6;
+#if defined (ADDR_FLASH_SECTOR_8)
+    } else if (address < ADDR_FLASH_SECTOR_8) {
+        sector = 7;
+    } else if (address < ADDR_FLASH_SECTOR_9) {
+        sector = 8;
+    } else if (address < ADDR_FLASH_SECTOR_10) {
+        sector = 9;
+    } else if (address < ADDR_FLASH_SECTOR_11) {
+        sector = 10;
+    } else {
+        sector = 11;
+    }
+#else
+    } else {
+        sector = 7;
     }
+#endif
 #endif
     return sector;
 }
@@ -239,11 +263,11 @@ static uint32_t GetSectorSize(uint32_t Sector)
 #else // SINGLE BANK
     if ((Sector == FLASH_SECTOR_0) || (Sector == FLASH_SECTOR_1) || \
             (Sector == FLASH_SECTOR_2) || (Sector == FLASH_SECTOR_3)) {
-        sectorsize = 32 * 1024;
+        sectorsize = ADDR_FLASH_SECTOR_1 - ADDR_FLASH_SECTOR_0;
     } else if (Sector == FLASH_SECTOR_4) {
-        sectorsize = 128 * 1024;
+        sectorsize = ADDR_FLASH_SECTOR_5 - ADDR_FLASH_SECTOR_4;
     } else {
-        sectorsize = 256 * 1024;
+        sectorsize = ADDR_FLASH_SECTOR_7 - ADDR_FLASH_SECTOR_6;
     }
 #endif
     return sectorsize;

targets/TARGET_STM/TARGET_STM32F7/spi_api.c

@@ -58,7 +58,9 @@ int spi_get_clock_freq(spi_t *obj)
         case SPI_1:
         case SPI_4:
         case SPI_5:
+    #if defined SPI6_BASE
         case SPI_6:
+    #endif // defined SPI6_BASE
             /* SPI_1, SPI_4, SPI_5 and SPI_6. Source CLK is PCKL2 */
             spi_hz = HAL_RCC_GetPCLK2Freq();
             break;