mcu: apollo4p: Update to SDK4.5.0

Updates to DCU Updates to HFRC2 for USB Added support for SD Card Updated support for HFRC2 Adjustment Added internal error handling for IOM Updated RTC due to Errata ERR126 Signed-off-by: Richard Wheatley <[email protected]>
zephyrproject-rtos · Jun 25, 2024 · de3a67e · de3a67e
1 parent e25327f
commit de3a67e
Show file tree

Hide file tree

Showing 107 changed files with 2,265 additions and 957 deletions.
diff --git a/mcu/apollo4p/am_mcu_apollo.h b/mcu/apollo4p/am_mcu_apollo.h
@@ -16,7 +16,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 

diff --git a/mcu/apollo4p/hal/Makefile b/mcu/apollo4p/hal/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile - Rules for building the libraries, examples and docs.
 #
-# Copyright (c) 2023, Ambiq Micro, Inc.
+# Copyright (c) 2024, Ambiq Micro, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+# This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 #
 #******************************************************************************
 

diff --git a/mcu/apollo4p/hal/am_hal_access.c b/mcu/apollo4p/hal/am_hal_access.c
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 

diff --git a/mcu/apollo4p/hal/am_hal_access.h b/mcu/apollo4p/hal/am_hal_access.h
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #ifndef AM_HAL_ACCESS_H

diff --git a/mcu/apollo4p/hal/am_hal_adc.c b/mcu/apollo4p/hal/am_hal_adc.c
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision stable-7da8bae71f of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 
@@ -547,8 +547,7 @@ am_hal_adc_configure_slot(void *pHandle,
         return AM_HAL_STATUS_OUT_OF_RANGE;
     }
 
-    if ( (pSlotConfig->ui32TrkCyc < AM_HAL_ADC_MIN_TRKCYC) ||
-         (pSlotConfig->ui32TrkCyc > _FLD2VAL(ADC_SL0CFG_TRKCYC0, 0xFFFFFFFF)) )
+    if (pSlotConfig->ui32TrkCyc > _FLD2VAL(ADC_SL0CFG_TRKCYC0, 0xFFFFFFFF))
     {
         return AM_HAL_STATUS_INVALID_ARG;
     }
@@ -557,7 +556,6 @@ am_hal_adc_configure_slot(void *pHandle,
     am_hal_adc_state_t  *pADCState = (am_hal_adc_state_t *)pHandle;
     uint32_t            ui32Module = pADCState->ui32Module;
 
-
     ui32Config = 0;
 
     //

diff --git a/mcu/apollo4p/hal/am_hal_adc.h b/mcu/apollo4p/hal/am_hal_adc.h
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision stable-7da8bae71f of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #ifndef AM_HAL_ADC_H

diff --git a/mcu/apollo4p/hal/am_hal_audadc.c b/mcu/apollo4p/hal/am_hal_audadc.c
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision stable-7da8bae71f of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 
@@ -568,7 +568,6 @@ am_hal_audadc_slot_dc_offset_calculate(void *pHandle,
     uint32_t            ui32PreciMode = 0, ui32NumBits = 0;
     float *             pfTemp;
 
-
 #ifndef AM_HAL_DISABLE_API_VALIDATION
     //
     // Check the handle.

diff --git a/mcu/apollo4p/hal/am_hal_audadc.h b/mcu/apollo4p/hal/am_hal_audadc.h
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #ifndef AM_HAL_AUDADC_H
@@ -975,7 +975,6 @@ extern uint32_t am_hal_audadc_samples_read(void *pHandle,
 //*****************************************************************************
 extern uint32_t am_hal_audadc_sw_trigger(void *pHandle);
 
-
 //*****************************************************************************
 //
 //! @brief AUDADC power control function

diff --git a/mcu/apollo4p/hal/am_hal_dcu.c b/mcu/apollo4p/hal/am_hal_dcu.c
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #include "am_mcu_apollo.h"
@@ -56,6 +56,12 @@ uint64_t gDcuDisable  = AM_HAL_DCURAW_DISABLE;
 volatile uint32_t *gpDcuEnable = &CRYPTO->HOSTDCUEN2;
 volatile uint32_t *gpDcuLock   = &CRYPTO->HOSTDCULOCK2;
 
+typedef union
+{
+    uint64_t u64;
+    uint32_t u32[2];
+} am_hal_64b_dcu_t;
+
 //*****************************************************************************
 //
 //! @brief Get the Current RAW DCU Mask
@@ -102,20 +108,6 @@ get_ui32_dcu_mask(uint64_t ui64DcuMask, uint8_t threeBitVal)
     return ui32Mask;
 }
 
-//*****************************************************************************
-//
-//! @brief Copy words from Register to Register
-//
-//*****************************************************************************
-static void
-copy_words(uint32_t *pDst, uint32_t *pSrc, uint32_t numWords)
-{
-    while (numWords--)
-    {
-        AM_REGVAL((pDst + numWords)) = AM_REGVAL((pSrc + numWords));
-    }
-}
-
 //*****************************************************************************
 //
 //! @brief  Read DCU Lock
@@ -130,7 +122,10 @@ copy_words(uint32_t *pDst, uint32_t *pSrc, uint32_t numWords)
 static
 uint32_t am_hal_dcu_raw_lock_status_get(uint64_t *pui64Val)
 {
-    copy_words((uint32_t *)pui64Val, (uint32_t *)gpDcuLock, sizeof(uint64_t) / 4);
+    am_hal_64b_dcu_t value;
+    value.u32[0] = AM_REGVAL(gpDcuLock);
+    value.u32[1] = AM_REGVAL(gpDcuLock + 1);
+    *pui64Val = value.u64;
     return AM_HAL_STATUS_SUCCESS;
 }
 
@@ -224,7 +219,10 @@ uint32_t am_hal_dcu_lock(uint32_t ui32Mask)
 static
 uint32_t am_hal_dcu_raw_get(uint64_t *pui64Val)
 {
-    copy_words((uint32_t *)pui64Val, (uint32_t *)gpDcuEnable, sizeof(uint64_t) / 4);
+    am_hal_64b_dcu_t value;
+    value.u32[0] = AM_REGVAL(gpDcuEnable);
+    value.u32[1] = AM_REGVAL(gpDcuEnable + 1);
+    *pui64Val = value.u64;
     return AM_HAL_STATUS_SUCCESS;
 }
 
@@ -268,23 +266,26 @@ uint32_t am_hal_dcu_get(uint32_t *pui32Val)
 static
 uint32_t am_hal_dcu_raw_update(bool bEnable, uint64_t ui64Mask)
 {
-    uint64_t dcuVal;
-    uint64_t dcuLock;
-    copy_words((uint32_t *)&dcuLock, (uint32_t *)gpDcuLock, sizeof(uint64_t) / 4);
-    if (ui64Mask & dcuLock)
+    am_hal_64b_dcu_t dcuVal;
+    am_hal_64b_dcu_t dcuLock;
+    dcuLock.u32[0] = AM_REGVAL(gpDcuLock);
+    dcuLock.u32[1] = AM_REGVAL(gpDcuLock + 1);
+    if (ui64Mask & dcuLock.u64)
     {
         return AM_HAL_STATUS_INVALID_OPERATION;
     }
-    copy_words((uint32_t *)&dcuVal, (uint32_t *)gpDcuEnable, sizeof(uint64_t) / 4);
+    dcuVal.u32[0] = AM_REGVAL(gpDcuEnable);
+    dcuVal.u32[1] = AM_REGVAL(gpDcuEnable + 1);
     if (bEnable)
     {
-        dcuVal = (dcuVal & ~ui64Mask) | (gDcuEnable & ui64Mask);
+        dcuVal.u64 = (dcuVal.u64 & ~ui64Mask) | (gDcuEnable & ui64Mask);
     }
     else
     {
-        dcuVal = (dcuVal & ~ui64Mask) | (gDcuDisable & ui64Mask);
+        dcuVal.u64 = (dcuVal.u64 & ~ui64Mask) | (gDcuDisable & ui64Mask);
     }
-    copy_words((uint32_t *)gpDcuEnable, (uint32_t *)&dcuVal, sizeof(uint64_t) / 4);
+    AM_REGVAL(gpDcuEnable) = dcuVal.u32[0];
+    AM_REGVAL(gpDcuEnable + 1) = dcuVal.u32[1];
     CRYPTO_CC_IS_IDLE();
     return AM_HAL_STATUS_SUCCESS;
 }

diff --git a/mcu/apollo4p/hal/am_hal_dcu.h b/mcu/apollo4p/hal/am_hal_dcu.h
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 

diff --git a/mcu/apollo4p/hal/am_hal_global.c b/mcu/apollo4p/hal/am_hal_global.c
@@ -17,7 +17,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 

diff --git a/mcu/apollo4p/hal/am_hal_global.h b/mcu/apollo4p/hal/am_hal_global.h
@@ -16,7 +16,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision stable-7da8bae71f of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #ifndef AM_HAL_GLOBAL_H
@@ -150,7 +150,7 @@ extern "C"
 //! @{
 //
 //*****************************************************************************
-#elif defined(gcc)
+#elif defined(gcc) || defined(segger)
 #define AM_SHARED_RW      __attribute__((section(".shared")))
 #define AM_RESOURCE_TABLE __attribute__((section(".resource_table")))
 #define AM_USED           __attribute__((used))

diff --git a/mcu/apollo4p/hal/am_hal_gpio.c b/mcu/apollo4p/hal/am_hal_gpio.c
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision release_sdk_4_4_0-3c5977e664 of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 

diff --git a/mcu/apollo4p/hal/am_hal_gpio.h b/mcu/apollo4p/hal/am_hal_gpio.h
@@ -12,7 +12,7 @@
 
 //*****************************************************************************
 //
-// Copyright (c) 2023, Ambiq Micro, Inc.
+// Copyright (c) 2024, Ambiq Micro, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-// This is part of revision stable-7da8bae71f of the AmbiqSuite Development Package.
+// This is part of revision release_sdk_4_5_0-a1ef3b89f9 of the AmbiqSuite Development Package.
 //
 //*****************************************************************************
 #ifndef AM_HAL_GPIO_H