Merge pull request #4510 from kegilbert/rearrange-odin-target-rebase

u-blox rearrange ODIN target
ARMmbed · Jun 15, 2017 · 226af54 · 226af54
2 parents f16ca56 + 6a270fb
commit 226af54
Show file tree

Hide file tree

Showing 57 changed files with 9 additions and 20,699 deletions.
diff --git a/...ARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h → ...ARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h b/...ARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h → ...ARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h
@@ -42,6 +42,9 @@ typedef enum {
     ADC_3 = (int)ADC3_BASE
 } ADCName;
 
+typedef enum {
+    DAC_1 = (int)DAC_BASE
+} DACName;
 
 typedef enum {
     UART_1 = (int)USART1_BASE,

diff --git a/...TARGET_UBLOX_EVK_ODIN_W2/PeripheralPins.c → ...TARGET_UBLOX_EVK_ODIN_W2/PeripheralPins.c b/...TARGET_UBLOX_EVK_ODIN_W2/PeripheralPins.c → ...TARGET_UBLOX_EVK_ODIN_W2/PeripheralPins.c
diff --git a/...M32F4/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h → ...439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h b/...M32F4/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h → ...439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h
diff --git a/...32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/LICENSE → ...39xI/TARGET_UBLOX_EVK_ODIN_W2/sdk/LICENSE b/...32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/LICENSE → ...39xI/TARGET_UBLOX_EVK_ODIN_W2/sdk/LICENSE
diff --git a/...LICENSE-permissive-binary-license-1.0.txt → ...LICENSE-permissive-binary-license-1.0.txt b/...LICENSE-permissive-binary-license-1.0.txt → ...LICENSE-permissive-binary-license-1.0.txt
diff --git a/.../TOOLCHAIN_ARM/libublox-odin-w2-driver.ar → .../TOOLCHAIN_ARM/libublox-odin-w2-driver.ar b/.../TOOLCHAIN_ARM/libublox-odin-w2-driver.ar → .../TOOLCHAIN_ARM/libublox-odin-w2-driver.ar
diff --git a/...OLCHAIN_GCC_ARM/libublox-odin-w2-driver.a → ...OLCHAIN_GCC_ARM/libublox-odin-w2-driver.a b/...OLCHAIN_GCC_ARM/libublox-odin-w2-driver.a → ...OLCHAIN_GCC_ARM/libublox-odin-w2-driver.a
diff --git a/...k/TOOLCHAIN_IAR/libublox-odin-w2-driver.a → ...k/TOOLCHAIN_IAR/libublox-odin-w2-driver.a b/...k/TOOLCHAIN_IAR/libublox-odin-w2-driver.a → ...k/TOOLCHAIN_IAR/libublox-odin-w2-driver.a
diff --git a/...ublox-odin-w2-drivers/OdinWiFiInterface.h → ...ublox-odin-w2-drivers/OdinWiFiInterface.h b/...ublox-odin-w2-drivers/OdinWiFiInterface.h → ...ublox-odin-w2-drivers/OdinWiFiInterface.h
diff --git a/...N_W2/sdk/ublox-odin-w2-drivers/bt_types.h → ...N_W2/sdk/ublox-odin-w2-drivers/bt_types.h b/...N_W2/sdk/ublox-odin-w2-drivers/bt_types.h → ...N_W2/sdk/ublox-odin-w2-drivers/bt_types.h
diff --git a/..._W2/sdk/ublox-odin-w2-drivers/cb_assert.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_assert.h b/..._W2/sdk/ublox-odin-w2-drivers/cb_assert.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_assert.h
diff --git a/...dk/ublox-odin-w2-drivers/cb_bt_conn_man.h → ...dk/ublox-odin-w2-drivers/cb_bt_conn_man.h b/...dk/ublox-odin-w2-drivers/cb_bt_conn_man.h → ...dk/ublox-odin-w2-drivers/cb_bt_conn_man.h
diff --git a/..._W2/sdk/ublox-odin-w2-drivers/cb_bt_man.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_bt_man.h b/..._W2/sdk/ublox-odin-w2-drivers/cb_bt_man.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_bt_man.h
diff --git a/..._W2/sdk/ublox-odin-w2-drivers/cb_bt_pan.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_bt_pan.h b/..._W2/sdk/ublox-odin-w2-drivers/cb_bt_pan.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_bt_pan.h
diff --git a/...sdk/ublox-odin-w2-drivers/cb_bt_sec_man.h → ...sdk/ublox-odin-w2-drivers/cb_bt_sec_man.h b/...sdk/ublox-odin-w2-drivers/cb_bt_sec_man.h → ...sdk/ublox-odin-w2-drivers/cb_bt_sec_man.h
diff --git a/.../sdk/ublox-odin-w2-drivers/cb_bt_serial.h → .../sdk/ublox-odin-w2-drivers/cb_bt_serial.h b/.../sdk/ublox-odin-w2-drivers/cb_bt_serial.h → .../sdk/ublox-odin-w2-drivers/cb_bt_serial.h
diff --git a/...k/ublox-odin-w2-drivers/cb_bt_serial_le.h → ...k/ublox-odin-w2-drivers/cb_bt_serial_le.h b/...k/ublox-odin-w2-drivers/cb_bt_serial_le.h → ...k/ublox-odin-w2-drivers/cb_bt_serial_le.h
diff --git a/...dk/ublox-odin-w2-drivers/cb_bt_test_man.h → ...dk/ublox-odin-w2-drivers/cb_bt_test_man.h b/...dk/ublox-odin-w2-drivers/cb_bt_test_man.h → ...dk/ublox-odin-w2-drivers/cb_bt_test_man.h
diff --git a/...2/sdk/ublox-odin-w2-drivers/cb_bt_utils.h → ...2/sdk/ublox-odin-w2-drivers/cb_bt_utils.h b/...2/sdk/ublox-odin-w2-drivers/cb_bt_utils.h → ...2/sdk/ublox-odin-w2-drivers/cb_bt_utils.h
diff --git a/...W2/sdk/ublox-odin-w2-drivers/cb_comdefs.h → ...W2/sdk/ublox-odin-w2-drivers/cb_comdefs.h b/...W2/sdk/ublox-odin-w2-drivers/cb_comdefs.h → ...W2/sdk/ublox-odin-w2-drivers/cb_comdefs.h
diff --git a/...IN_W2/sdk/ublox-odin-w2-drivers/cb_gatt.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_gatt.h b/...IN_W2/sdk/ublox-odin-w2-drivers/cb_gatt.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_gatt.h
diff --git a/...dk/ublox-odin-w2-drivers/cb_gatt_client.h → ...dk/ublox-odin-w2-drivers/cb_gatt_client.h b/...dk/ublox-odin-w2-drivers/cb_gatt_client.h → ...dk/ublox-odin-w2-drivers/cb_gatt_client.h
diff --git a/...dk/ublox-odin-w2-drivers/cb_gatt_server.h → ...dk/ublox-odin-w2-drivers/cb_gatt_server.h b/...dk/ublox-odin-w2-drivers/cb_gatt_server.h → ...dk/ublox-odin-w2-drivers/cb_gatt_server.h
diff --git a/...sdk/ublox-odin-w2-drivers/cb_gatt_utils.h → ...sdk/ublox-odin-w2-drivers/cb_gatt_utils.h b/...sdk/ublox-odin-w2-drivers/cb_gatt_utils.h → ...sdk/ublox-odin-w2-drivers/cb_gatt_utils.h
diff --git a/...ODIN_W2/sdk/ublox-odin-w2-drivers/cb_hw.h → ...ODIN_W2/sdk/ublox-odin-w2-drivers/cb_hw.h b/...ODIN_W2/sdk/ublox-odin-w2-drivers/cb_hw.h → ...ODIN_W2/sdk/ublox-odin-w2-drivers/cb_hw.h
diff --git a/...IN_W2/sdk/ublox-odin-w2-drivers/cb_main.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_main.h b/...IN_W2/sdk/ublox-odin-w2-drivers/cb_main.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_main.h
diff --git a/...DIN_W2/sdk/ublox-odin-w2-drivers/cb_otp.h → ...DIN_W2/sdk/ublox-odin-w2-drivers/cb_otp.h b/...DIN_W2/sdk/ublox-odin-w2-drivers/cb_otp.h → ...DIN_W2/sdk/ublox-odin-w2-drivers/cb_otp.h
diff --git a/...odin-w2-drivers/cb_platform_basic_types.h → ...odin-w2-drivers/cb_platform_basic_types.h b/...odin-w2-drivers/cb_platform_basic_types.h → ...odin-w2-drivers/cb_platform_basic_types.h
diff --git a/...sdk/ublox-odin-w2-drivers/cb_port_types.h → ...sdk/ublox-odin-w2-drivers/cb_port_types.h b/...sdk/ublox-odin-w2-drivers/cb_port_types.h → ...sdk/ublox-odin-w2-drivers/cb_port_types.h
diff --git a/..._W2/sdk/ublox-odin-w2-drivers/cb_status.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_status.h b/..._W2/sdk/ublox-odin-w2-drivers/cb_status.h → ..._W2/sdk/ublox-odin-w2-drivers/cb_status.h
diff --git a/...N_W2/sdk/ublox-odin-w2-drivers/cb_types.h → ...N_W2/sdk/ublox-odin-w2-drivers/cb_types.h b/...N_W2/sdk/ublox-odin-w2-drivers/cb_types.h → ...N_W2/sdk/ublox-odin-w2-drivers/cb_types.h
diff --git a/...2/sdk/ublox-odin-w2-drivers/cb_watchdog.h → ...2/sdk/ublox-odin-w2-drivers/cb_watchdog.h b/...2/sdk/ublox-odin-w2-drivers/cb_watchdog.h → ...2/sdk/ublox-odin-w2-drivers/cb_watchdog.h
diff --git a/...IN_W2/sdk/ublox-odin-w2-drivers/cb_wlan.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_wlan.h b/...IN_W2/sdk/ublox-odin-w2-drivers/cb_wlan.h → ...IN_W2/sdk/ublox-odin-w2-drivers/cb_wlan.h
diff --git a/...lox-odin-w2-drivers/cb_wlan_target_data.h → ...lox-odin-w2-drivers/cb_wlan_target_data.h b/...lox-odin-w2-drivers/cb_wlan_target_data.h → ...lox-odin-w2-drivers/cb_wlan_target_data.h
diff --git a/...sdk/ublox-odin-w2-drivers/cb_wlan_types.h → ...sdk/ublox-odin-w2-drivers/cb_wlan_types.h b/...sdk/ublox-odin-w2-drivers/cb_wlan_types.h → ...sdk/ublox-odin-w2-drivers/cb_wlan_types.h
diff --git a/...K_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp → ...K_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp b/...K_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp → ...K_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp
diff --git a/...EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.h → ...EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.h b/...EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.h → ...EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.h
diff --git a/...LOX_EVK_ODIN_W2/device/system_stm32f4xx.c → ...RGET_UBLOX_EVK_ODIN_W2/system_stm32f4xx.c b/...LOX_EVK_ODIN_W2/device/system_stm32f4xx.c → ...RGET_UBLOX_EVK_ODIN_W2/system_stm32f4xx.c
@@ -734,11 +734,13 @@ void SystemInit_ExtMemCtl(void)
   /* No pull-up, pull-down for PGx pins */ 
   GPIOG->PUPDR   = 0x00000000;
 
-/*-- FMC/FSMC Configuration --------------------------------------------------*/                                                                               
+/*-- FMC/FSMC Configuration --------------------------------------------------*/
   /* Enable the FMC/FSMC interface clock */
   RCC->AHB3ENR         |= 0x00000001;
-
-#if defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx)|| defined(STM32F439xx) 
+
+#if defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)
+  /* Delay after an RCC peripheral clock enabling */
+  tmp = READ_BIT(RCC->AHB3ENR, RCC_AHB3ENR_FMCEN);
   /* Configure and enable Bank1_SRAM2 */
   FMC_Bank1->BTCR[2]  = 0x00001011;
   FMC_Bank1->BTCR[3]  = 0x00000201;

diff --git a/.../TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_MICRO/startup_stm32f439xx.S b/.../TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_MICRO/startup_stm32f439xx.S
diff --git a/...ET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_MICRO/stm32f439xx.sct b/...ET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_MICRO/stm32f439xx.sct
diff --git a/...TM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/startup_stm32f439xx.S b/...TM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/startup_stm32f439xx.S
diff --git a/...RGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/stm32f439xx.sct b/...RGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/stm32f439xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/...ARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_GCC_ARM/STM32F439ZI.ld b/...ARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_GCC_ARM/STM32F439ZI.ld